Browse Source

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

xiejing 4 years ago
parent
commit
c6d5c1da1b

+ 98 - 98
assets/resources/configs/Levels.json

@@ -4,7 +4,7 @@
         "awards": 10,
         "killAward": 3,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 5,
         "monsters": [
             {
                 "mId": "M1",
@@ -61,7 +61,7 @@
         "awards": 11,
         "killAward": 4,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 5,
         "monsters": [
             {
                 "mId": "M4",
@@ -214,7 +214,7 @@
         "awards": 14,
         "killAward": 4,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 5,
         "monsters": [
             {
                 "mId": "M13",
@@ -367,7 +367,7 @@
         "awards": 18,
         "killAward": 5,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 5,
         "monsters": [
             {
                 "mId": "M22",
@@ -520,7 +520,7 @@
         "awards": 23,
         "killAward": 6,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 5,
         "monsters": [
             {
                 "mId": "M31",
@@ -673,7 +673,7 @@
         "awards": 30,
         "killAward": 7,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 6,
         "monsters": [
             {
                 "mId": "M40",
@@ -826,7 +826,7 @@
         "awards": 39,
         "killAward": 9,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 6,
         "monsters": [
             {
                 "mId": "M49",
@@ -979,7 +979,7 @@
         "awards": 51,
         "killAward": 11,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 6,
         "monsters": [
             {
                 "mId": "M58",
@@ -1132,7 +1132,7 @@
         "awards": 66,
         "killAward": 13,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 6,
         "monsters": [
             {
                 "mId": "M67",
@@ -1285,7 +1285,7 @@
         "awards": 86,
         "killAward": 15,
         "maxAnger": 100,
-        "diamondRewards": 10,
+        "diamondRewards": 6,
         "monsters": [
             {
                 "mId": "M76",
@@ -1438,7 +1438,7 @@
         "awards": 112,
         "killAward": 19,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 7,
         "monsters": [
             {
                 "mId": "M85",
@@ -1591,7 +1591,7 @@
         "awards": 146,
         "killAward": 22,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 7,
         "monsters": [
             {
                 "mId": "M94",
@@ -1744,7 +1744,7 @@
         "awards": 190,
         "killAward": 27,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 7,
         "monsters": [
             {
                 "mId": "M103",
@@ -1897,7 +1897,7 @@
         "awards": 247,
         "killAward": 32,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 7,
         "monsters": [
             {
                 "mId": "M112",
@@ -2050,7 +2050,7 @@
         "awards": 321,
         "killAward": 39,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 7,
         "monsters": [
             {
                 "mId": "M121",
@@ -2203,7 +2203,7 @@
         "awards": 417,
         "killAward": 46,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 8,
         "monsters": [
             {
                 "mId": "M130",
@@ -2356,7 +2356,7 @@
         "awards": 542,
         "killAward": 55,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 8,
         "monsters": [
             {
                 "mId": "M139",
@@ -2509,7 +2509,7 @@
         "awards": 705,
         "killAward": 67,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 8,
         "monsters": [
             {
                 "mId": "M148",
@@ -2662,7 +2662,7 @@
         "awards": 917,
         "killAward": 80,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 8,
         "monsters": [
             {
                 "mId": "M157",
@@ -2815,7 +2815,7 @@
         "awards": 1192,
         "killAward": 96,
         "maxAnger": 100,
-        "diamondRewards": 20,
+        "diamondRewards": 8,
         "monsters": [
             {
                 "mId": "M166",
@@ -2968,7 +2968,7 @@
         "awards": 1550,
         "killAward": 115,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 9,
         "monsters": [
             {
                 "mId": "M175",
@@ -3121,7 +3121,7 @@
         "awards": 2015,
         "killAward": 138,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 9,
         "monsters": [
             {
                 "mId": "M184",
@@ -3274,7 +3274,7 @@
         "awards": 2620,
         "killAward": 166,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 9,
         "monsters": [
             {
                 "mId": "M193",
@@ -3427,7 +3427,7 @@
         "awards": 3406,
         "killAward": 199,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 9,
         "monsters": [
             {
                 "mId": "M202",
@@ -3580,7 +3580,7 @@
         "awards": 4428,
         "killAward": 238,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 9,
         "monsters": [
             {
                 "mId": "M211",
@@ -3733,7 +3733,7 @@
         "awards": 5756,
         "killAward": 286,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 10,
         "monsters": [
             {
                 "mId": "M220",
@@ -3886,7 +3886,7 @@
         "awards": 7483,
         "killAward": 343,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 10,
         "monsters": [
             {
                 "mId": "M229",
@@ -4039,7 +4039,7 @@
         "awards": 9728,
         "killAward": 412,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 10,
         "monsters": [
             {
                 "mId": "M238",
@@ -4192,7 +4192,7 @@
         "awards": 12646,
         "killAward": 495,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 10,
         "monsters": [
             {
                 "mId": "M247",
@@ -4345,7 +4345,7 @@
         "awards": 16440,
         "killAward": 593,
         "maxAnger": 100,
-        "diamondRewards": 30,
+        "diamondRewards": 10,
         "monsters": [
             {
                 "mId": "M256",
@@ -4498,7 +4498,7 @@
         "awards": 21372,
         "killAward": 712,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 11,
         "monsters": [
             {
                 "mId": "M265",
@@ -4651,7 +4651,7 @@
         "awards": 27784,
         "killAward": 855,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 11,
         "monsters": [
             {
                 "mId": "M274",
@@ -4804,7 +4804,7 @@
         "awards": 36119,
         "killAward": 1025,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 11,
         "monsters": [
             {
                 "mId": "M283",
@@ -4957,7 +4957,7 @@
         "awards": 46955,
         "killAward": 1231,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 11,
         "monsters": [
             {
                 "mId": "M292",
@@ -5110,7 +5110,7 @@
         "awards": 61042,
         "killAward": 1477,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 11,
         "monsters": [
             {
                 "mId": "M301",
@@ -5263,7 +5263,7 @@
         "awards": 79355,
         "killAward": 1772,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 12,
         "monsters": [
             {
                 "mId": "M310",
@@ -5416,7 +5416,7 @@
         "awards": 103162,
         "killAward": 2126,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 12,
         "monsters": [
             {
                 "mId": "M319",
@@ -5569,7 +5569,7 @@
         "awards": 134111,
         "killAward": 2552,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 12,
         "monsters": [
             {
                 "mId": "M328",
@@ -5722,7 +5722,7 @@
         "awards": 174344,
         "killAward": 3062,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 12,
         "monsters": [
             {
                 "mId": "M337",
@@ -5875,7 +5875,7 @@
         "awards": 226647,
         "killAward": 3674,
         "maxAnger": 100,
-        "diamondRewards": 40,
+        "diamondRewards": 12,
         "monsters": [
             {
                 "mId": "M346",
@@ -6028,7 +6028,7 @@
         "awards": 294641,
         "killAward": 4409,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 13,
         "monsters": [
             {
                 "mId": "M355",
@@ -6181,7 +6181,7 @@
         "awards": 383033,
         "killAward": 5291,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 13,
         "monsters": [
             {
                 "mId": "M364",
@@ -6334,7 +6334,7 @@
         "awards": 497943,
         "killAward": 6349,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 13,
         "monsters": [
             {
                 "mId": "M373",
@@ -6487,7 +6487,7 @@
         "awards": 647326,
         "killAward": 7619,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 13,
         "monsters": [
             {
                 "mId": "M382",
@@ -6640,7 +6640,7 @@
         "awards": 841524,
         "killAward": 9143,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 13,
         "monsters": [
             {
                 "mId": "M391",
@@ -6793,7 +6793,7 @@
         "awards": 1093981,
         "killAward": 10972,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 14,
         "monsters": [
             {
                 "mId": "M400",
@@ -6946,7 +6946,7 @@
         "awards": 1422175,
         "killAward": 13166,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 14,
         "monsters": [
             {
                 "mId": "M409",
@@ -7099,7 +7099,7 @@
         "awards": 1848828,
         "killAward": 15799,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 14,
         "monsters": [
             {
                 "mId": "M418",
@@ -7252,7 +7252,7 @@
         "awards": 2403476,
         "killAward": 18959,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 14,
         "monsters": [
             {
                 "mId": "M427",
@@ -7405,7 +7405,7 @@
         "awards": 3124519,
         "killAward": 22751,
         "maxAnger": 100,
-        "diamondRewards": 50,
+        "diamondRewards": 14,
         "monsters": [
             {
                 "mId": "M436",
@@ -7558,7 +7558,7 @@
         "awards": 4061875,
         "killAward": 27301,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 15,
         "monsters": [
             {
                 "mId": "M445",
@@ -7711,7 +7711,7 @@
         "awards": 5280438,
         "killAward": 32762,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 15,
         "monsters": [
             {
                 "mId": "M454",
@@ -7864,7 +7864,7 @@
         "awards": 6864569,
         "killAward": 39314,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 15,
         "monsters": [
             {
                 "mId": "M463",
@@ -8017,7 +8017,7 @@
         "awards": 8923940,
         "killAward": 47177,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 15,
         "monsters": [
             {
                 "mId": "M472",
@@ -8170,7 +8170,7 @@
         "awards": 11601122,
         "killAward": 56612,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 15,
         "monsters": [
             {
                 "mId": "M481",
@@ -8323,7 +8323,7 @@
         "awards": 15081459,
         "killAward": 67934,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 16,
         "monsters": [
             {
                 "mId": "M490",
@@ -8476,7 +8476,7 @@
         "awards": 19605897,
         "killAward": 81521,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 16,
         "monsters": [
             {
                 "mId": "M499",
@@ -8629,7 +8629,7 @@
         "awards": 25487666,
         "killAward": 97826,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 16,
         "monsters": [
             {
                 "mId": "M508",
@@ -8782,7 +8782,7 @@
         "awards": 33133966,
         "killAward": 117391,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 16,
         "monsters": [
             {
                 "mId": "M517",
@@ -8935,7 +8935,7 @@
         "awards": 43074156,
         "killAward": 140869,
         "maxAnger": 100,
-        "diamondRewards": 60,
+        "diamondRewards": 16,
         "monsters": [
             {
                 "mId": "M526",
@@ -9088,7 +9088,7 @@
         "awards": 55996403,
         "killAward": 169043,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 17,
         "monsters": [
             {
                 "mId": "M535",
@@ -9241,7 +9241,7 @@
         "awards": 72795324,
         "killAward": 202851,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 17,
         "monsters": [
             {
                 "mId": "M544",
@@ -9394,7 +9394,7 @@
         "awards": 94633921,
         "killAward": 243421,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 17,
         "monsters": [
             {
                 "mId": "M553",
@@ -9547,7 +9547,7 @@
         "awards": 123024097,
         "killAward": 292106,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 17,
         "monsters": [
             {
                 "mId": "M562",
@@ -9700,7 +9700,7 @@
         "awards": 159931326,
         "killAward": 350527,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 17,
         "monsters": [
             {
                 "mId": "M571",
@@ -9853,7 +9853,7 @@
         "awards": 207910724,
         "killAward": 420632,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 18,
         "monsters": [
             {
                 "mId": "M580",
@@ -10006,7 +10006,7 @@
         "awards": 270283941,
         "killAward": 504758,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 18,
         "monsters": [
             {
                 "mId": "M589",
@@ -10159,7 +10159,7 @@
         "awards": 351369123,
         "killAward": 605710,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 18,
         "monsters": [
             {
                 "mId": "M598",
@@ -10312,7 +10312,7 @@
         "awards": 456779860,
         "killAward": 726852,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 18,
         "monsters": [
             {
                 "mId": "M607",
@@ -10465,7 +10465,7 @@
         "awards": 593813818,
         "killAward": 872222,
         "maxAnger": 100,
-        "diamondRewards": 70,
+        "diamondRewards": 18,
         "monsters": [
             {
                 "mId": "M616",
@@ -10618,7 +10618,7 @@
         "awards": 771957963,
         "killAward": 1046667,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 19,
         "monsters": [
             {
                 "mId": "M625",
@@ -10771,7 +10771,7 @@
         "awards": 1003545352,
         "killAward": 1256000,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 19,
         "monsters": [
             {
                 "mId": "M634",
@@ -10924,7 +10924,7 @@
         "awards": 1304608958,
         "killAward": 1507200,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 19,
         "monsters": [
             {
                 "mId": "M643",
@@ -11077,7 +11077,7 @@
         "awards": 1695991645,
         "killAward": 1808640,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 19,
         "monsters": [
             {
                 "mId": "M652",
@@ -11230,7 +11230,7 @@
         "awards": 2204789139,
         "killAward": 2170368,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 19,
         "monsters": [
             {
                 "mId": "M661",
@@ -11383,7 +11383,7 @@
         "awards": 2866225881,
         "killAward": 2604442,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 20,
         "monsters": [
             {
                 "mId": "M670",
@@ -11536,7 +11536,7 @@
         "awards": 3726093645,
         "killAward": 3125331,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 20,
         "monsters": [
             {
                 "mId": "M679",
@@ -11689,7 +11689,7 @@
         "awards": 4843921739,
         "killAward": 3750397,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 20,
         "monsters": [
             {
                 "mId": "M688",
@@ -11842,7 +11842,7 @@
         "awards": 6297098261,
         "killAward": 4500476,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 20,
         "monsters": [
             {
                 "mId": "M697",
@@ -11995,7 +11995,7 @@
         "awards": 8186227739,
         "killAward": 5400571,
         "maxAnger": 100,
-        "diamondRewards": 80,
+        "diamondRewards": 20,
         "monsters": [
             {
                 "mId": "M706",
@@ -12148,7 +12148,7 @@
         "awards": 10642096061,
         "killAward": 6480685,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 21,
         "monsters": [
             {
                 "mId": "M715",
@@ -12301,7 +12301,7 @@
         "awards": 13834724879,
         "killAward": 7776822,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 21,
         "monsters": [
             {
                 "mId": "M724",
@@ -12454,7 +12454,7 @@
         "awards": 17985142343,
         "killAward": 9332187,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 21,
         "monsters": [
             {
                 "mId": "M733",
@@ -12607,7 +12607,7 @@
         "awards": 23380685046,
         "killAward": 11198624,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 21,
         "monsters": [
             {
                 "mId": "M742",
@@ -12760,7 +12760,7 @@
         "awards": 30394890560,
         "killAward": 13438349,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 21,
         "monsters": [
             {
                 "mId": "M751",
@@ -12913,7 +12913,7 @@
         "awards": 39513357728,
         "killAward": 16126019,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 22,
         "monsters": [
             {
                 "mId": "M760",
@@ -13066,7 +13066,7 @@
         "awards": 51367365046,
         "killAward": 19351223,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 22,
         "monsters": [
             {
                 "mId": "M769",
@@ -13219,7 +13219,7 @@
         "awards": 66777574560,
         "killAward": 23221467,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 22,
         "monsters": [
             {
                 "mId": "M778",
@@ -13372,7 +13372,7 @@
         "awards": 86810846928,
         "killAward": 27865761,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 22,
         "monsters": [
             {
                 "mId": "M787",
@@ -13525,7 +13525,7 @@
         "awards": 112854101006,
         "killAward": 33438913,
         "maxAnger": 100,
-        "diamondRewards": 90,
+        "diamondRewards": 22,
         "monsters": [
             {
                 "mId": "M796",
@@ -13678,7 +13678,7 @@
         "awards": 146710331308,
         "killAward": 40126696,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 23,
         "monsters": [
             {
                 "mId": "M805",
@@ -13831,7 +13831,7 @@
         "awards": 190723430700,
         "killAward": 48152035,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 23,
         "monsters": [
             {
                 "mId": "M814",
@@ -13984,7 +13984,7 @@
         "awards": 247940459910,
         "killAward": 57782442,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 23,
         "monsters": [
             {
                 "mId": "M823",
@@ -14137,7 +14137,7 @@
         "awards": 322322597883,
         "killAward": 69338930,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 23,
         "monsters": [
             {
                 "mId": "M832",
@@ -14290,7 +14290,7 @@
         "awards": 419019377248,
         "killAward": 83206716,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 23,
         "monsters": [
             {
                 "mId": "M841",
@@ -14443,7 +14443,7 @@
         "awards": 544725190422,
         "killAward": 99848060,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 24,
         "monsters": [
             {
                 "mId": "M850",
@@ -14596,7 +14596,7 @@
         "awards": 708142747549,
         "killAward": 119817671,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 24,
         "monsters": [
             {
                 "mId": "M859",
@@ -14749,7 +14749,7 @@
         "awards": 920585571814,
         "killAward": 143781206,
         "maxAnger": 100,
-        "diamondRewards": 100,
+        "diamondRewards": 24,
         "monsters": [
             {
                 "mId": "M868",

+ 3 - 3
assets/resources/configs/Skill.json

@@ -5,7 +5,7 @@
         "name": "攻速",
         "time": 5000,
         "fireInterval": 75,
-        "damage": 1.5,
+        "damage": 1,
         "unController": 0,
         "infiniteAmmo": 0,
         "weaponFlicker": 1,
@@ -29,7 +29,7 @@
         "name": "无限子弹",
         "time": 5000,
         "fireInterval": 200,
-        "damage": 2,
+        "damage": 1,
         "unController": 0,
         "infiniteAmmo": 1,
         "weaponFlicker": 1,
@@ -41,7 +41,7 @@
         "name": "自瞄",
         "time": 5000,
         "fireInterval": 150,
-        "damage": 2,
+        "damage": 1.1,
         "unController": 1,
         "infiniteAmmo": 0,
         "weaponFlicker": 1,

+ 7 - 0
assets/scripts/Platform/NotPlatform.ts

@@ -38,6 +38,13 @@ export class NotPlatform implements IPlatform {
         }
     }
 
+    /**
+     * 被动分享
+     */
+    onShareAppMessage(): void {
+        
+    }
+
     /**
      * 显示Banner
      * @param data 

+ 18 - 2
assets/scripts/Platform/WeChat/WeChatPlatform.ts

@@ -18,6 +18,20 @@ export class WeChatPlatform extends BasePlatform {
     private __rewardedSuccess: Function;
     private __rewardedfailure: Function;
     private __systemInfo: any;
+
+    //分享语录
+    private _shareTitles:string[]=[
+        '打僵尸,我是最强的,不服来战',
+        '你的空投到了!点击领取!',
+        '什么,这游戏还能这么玩?!',
+        '这一波我有点扛不住啊!',
+        '枪神?我预定了,不服来战!',
+        '我终于得到了“哒哒哒”冒蓝光的加特林',
+        '老同学,还记得当年一起打的僵尸吗',
+        '人类!就你这样的手速,最后将会沦为我的食物!',
+        '啊呜,啊呜,啊呜,虽然二哈叫声也这样,但我可是会吃人的!',
+        '当我扣下扳机的那一刻,请你从哪里来回哪去!'
+    ]
     constructor() {
         super()
         this.__systemInfo = this.wx.getSystemInfoSync();
@@ -112,15 +126,17 @@ export class WeChatPlatform extends BasePlatform {
     shareMessage(data: any, success?: Function, failure?: Function): void {
         throw new Error('Method not implemented.');
     }
+
     onShareAppMessage():void{
         try {
             this.wx.showShareMenu({
                 withShareTicket: true
             });
+            let shareTitle = this._shareTitles[Math.floor(Math.random()*this._shareTitles.length)]
             this.wx.onShareAppMessage(()=>{
                 return {
-                    title: '打僵尸,我是最强的,不服来战',
-                    imageUrl: "https://www.maoxingame.com/QiangShenZhanJi/icons/10377_1.png"
+                    title: shareTitle,
+                    imageUrl: "https://www.maoxingame.com/QiangShenZhanJi/share/share1.jpg"
                 }
             })
             

+ 3 - 0
assets/scripts/games/scenes/PrepareScene.ts

@@ -49,6 +49,9 @@ export class PrepareScene extends Component {
         if (weChat instanceof WeChatPlatform) {
             weChat.branchAnalytics(branchIdType.EnterHall)
         }
+
+        PlatformManager.onShareAppMessage();
+
     }
 
     update(deltaTime: number) {

+ 7 - 3
assets/scripts/games/ui/gameovers/GameOverMediator.ts

@@ -67,9 +67,11 @@ export class GameOverMediator extends GUIMediator {
         this.DefeatedGroup.active = !this.isWin;
         //胜利
         if (this.isWin == true) {
+            this.WinBackButton.active = false;
             this.scheduleOnce(()=>{
-                this.WinGroup.active = true;
-            }, 2)
+                this.WinBackButton.active = true;
+            }, 2);
+            this.WinGroup.active = true;
             this.DefeatedGroup.active = false;
             let levelConfig: any = GameConfigManager.GetLevelConfig(GameModel.single.currentLevel - 1);
             //关卡基础奖励
@@ -92,9 +94,11 @@ export class GameOverMediator extends GUIMediator {
         } else {//失败
             //失败不算奖励
             this.WinGroup.active = false;
+            this.DefeatedBackButton.active = false;
             this.scheduleOnce(()=>{
-                this.DefeatedGroup.active = true;
+                this.DefeatedBackButton.active = true;
             }, 2)
+            this.DefeatedGroup.active = true;
             let weChat = PlatformManager.impl as WeChatPlatform;
             if (weChat instanceof WeChatPlatform) {
                 // weChat.failBranchAnalytics(String(GameModel.single.currentLevel));