Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28

bin/json/game_buriedcondi.json

@@ -17756,15 +17756,15 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_759",
-      "text": "装备副本boss2难度2"
+      "text": "火焰泰坦难度3"
     },
     "type": 73,
     "valid": 0,
     "NPC": 10344,
     "value": 1,
     "filter": [
-      2,
+      1,
-      2
+      3
     ],
     "filter2": [
       "boss类型",
@@ -17923,7 +17923,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_766",
-      "text": "维京远征火焰泰坦难度3"
+      "text": "火焰泰坦难度4"
     },
     "type": 73,
     "valid": 0,
@@ -17931,7 +17931,7 @@
     "value": 1,
     "filter": [
       1,
-      3
+      4
     ],
     "filter2": [
       "boss类型",

bin/json/game_hero.json

@@ -1472,7 +1472,7 @@
     "type": 1,
     "ip": 6,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "24001",
     "rotation": "0|0|0",
     "revolve": 0,

bin/json/game_mainstage.json

@@ -1767,7 +1767,7 @@
     "FormatList": [
       103041
     ],
-    "captainId": 240015,
+    "captainId": 130015,
     "star": [
       1,
       1,
@@ -10311,7 +10311,7 @@
     "FormatList": [
       123041
     ],
-    "captainId": 240015,
+    "captainId": 130015,
     "star": [
       1,
       1,
@@ -18855,7 +18855,7 @@
     "FormatList": [
       143041
     ],
-    "captainId": 240015,
+    "captainId": 130015,
     "star": [
       1,
       1,
@@ -27399,7 +27399,7 @@
     "FormatList": [
       163041
     ],
-    "captainId": 240015,
+    "captainId": 130015,
     "star": [
       1,
       1,

bin/json/game_monsterformat.json

@@ -115670,9 +115670,9 @@
     "equip": [],
     "newskill": [],
     "lv": 10,
-    "hppro": 1,
+    "hppro": 1.5,
     "atkpro": 0.35,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -115970,9 +115970,9 @@
     "equip": [],
     "newskill": [],
     "lv": 15,
-    "hppro": 3.5,
+    "hppro": 2.5,
-    "atkpro": 1,
+    "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -116270,9 +116270,9 @@
     "equip": [],
     "newskill": [],
     "lv": 20,
-    "hppro": 4,
+    "hppro": 3.5,
-    "atkpro": 1.2,
+    "atkpro": 0.65,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -116570,9 +116570,9 @@
     "equip": [],
     "newskill": [],
     "lv": 25,
-    "hppro": 5,
+    "hppro": 4.5,
-    "atkpro": 1.3,
+    "atkpro": 0.8,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -116870,9 +116870,9 @@
     "equip": [],
     "newskill": [],
     "lv": 30,
-    "hppro": 6,
+    "hppro": 5.5,
-    "atkpro": 1.3,
+    "atkpro": 0.95,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -117170,9 +117170,9 @@
     "equip": [],
     "newskill": [],
     "lv": 35,
-    "hppro": 8,
+    "hppro": 6.5,
-    "atkpro": 1.4,
+    "atkpro": 1.1,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -117470,9 +117470,9 @@
     "equip": [],
     "newskill": [],
     "lv": 40,
-    "hppro": 10,
+    "hppro": 7.5,
-    "atkpro": 1.4,
+    "atkpro": 1.25,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -117770,9 +117770,9 @@
     "equip": [],
     "newskill": [],
     "lv": 45,
-    "hppro": 12,
+    "hppro": 8.5,
-    "atkpro": 1.5,
+    "atkpro": 1.4,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -118070,9 +118070,9 @@
     "equip": [],
     "newskill": [],
     "lv": 50,
-    "hppro": 14,
+    "hppro": 9.5,
-    "atkpro": 1.5,
+    "atkpro": 1.55,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -118370,9 +118370,9 @@
     "equip": [],
     "newskill": [],
     "lv": 55,
-    "hppro": 16,
+    "hppro": 11,
-    "atkpro": 2,
+    "atkpro": 1.7,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -118671,7 +118671,7 @@
     "newskill": [],
     "lv": 10,
     "hppro": 2,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -118970,8 +118970,8 @@
     "equip": [],
     "newskill": [],
     "lv": 15,
-    "hppro": 3,
+    "hppro": 2.5,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -119270,8 +119270,8 @@
     "equip": [],
     "newskill": [],
     "lv": 20,
-    "hppro": 4,
+    "hppro": 3,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -119570,8 +119570,8 @@
     "equip": [],
     "newskill": [],
     "lv": 25,
-    "hppro": 5,
+    "hppro": 3.5,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -119870,8 +119870,8 @@
     "equip": [],
     "newskill": [],
     "lv": 30,
-    "hppro": 6,
+    "hppro": 4,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -120170,8 +120170,8 @@
     "equip": [],
     "newskill": [],
     "lv": 35,
-    "hppro": 7,
+    "hppro": 6,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -120471,7 +120471,7 @@
     "newskill": [],
     "lv": 40,
     "hppro": 8,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -120771,7 +120771,7 @@
     "newskill": [],
     "lv": 45,
     "hppro": 10,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -121071,7 +121071,7 @@
     "newskill": [],
     "lv": 50,
     "hppro": 12,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -121371,7 +121371,7 @@
     "newskill": [],
     "lv": 55,
     "hppro": 14,
-    "atkpro": 1,
+    "atkpro": 0.8,
     "defpro": 0.3,
     "skill1": 1,
     "skill2": 1,
@@ -121671,7 +121671,7 @@
     "newskill": [],
     "lv": 10,
     "hppro": 2,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -121971,7 +121971,7 @@
     "newskill": [],
     "lv": 15,
     "hppro": 3,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -122271,7 +122271,7 @@
     "newskill": [],
     "lv": 20,
     "hppro": 4,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -122571,7 +122571,7 @@
     "newskill": [],
     "lv": 25,
     "hppro": 5,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -122871,7 +122871,7 @@
     "newskill": [],
     "lv": 30,
     "hppro": 6,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -123171,7 +123171,7 @@
     "newskill": [],
     "lv": 35,
     "hppro": 7,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -123471,7 +123471,7 @@
     "newskill": [],
     "lv": 40,
     "hppro": 8,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -123771,7 +123771,7 @@
     "newskill": [],
     "lv": 45,
     "hppro": 10,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -124071,7 +124071,7 @@
     "newskill": [],
     "lv": 50,
     "hppro": 11,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,
@@ -124371,7 +124371,7 @@
     "newskill": [],
     "lv": 55,
     "hppro": 12,
-    "atkpro": 1.5,
+    "atkpro": 1.2,
     "defpro": 0.4,
     "skill1": 1,
     "skill2": 1,

bin/json/game_pagoda.json

@@ -3007,7 +3007,7 @@
     "Level_type": 1,
     "layer_num": 1,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3038,7 +3038,7 @@
     "Level_type": 1,
     "layer_num": 2,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3069,7 +3069,7 @@
     "Level_type": 1,
     "layer_num": 3,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3100,7 +3100,7 @@
     "Level_type": 1,
     "layer_num": 4,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3131,7 +3131,7 @@
     "Level_type": 1,
     "layer_num": 5,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3173,7 +3173,7 @@
     "Level_type": 1,
     "layer_num": 6,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3204,7 +3204,7 @@
     "Level_type": 1,
     "layer_num": 7,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3235,7 +3235,7 @@
     "Level_type": 1,
     "layer_num": 8,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3266,7 +3266,7 @@
     "Level_type": 1,
     "layer_num": 9,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"
@@ -3297,7 +3297,7 @@
     "Level_type": 1,
     "layer_num": 10,
     "tab": 10,
-    "tabIcon": "xmwg_fb_rk3",
+    "tabIcon": "xmwg_fb_rk4",
     "tabTitle": {
       "key": "pagoda10",
       "text": "功夫宗师"

bin/json/game_rdtasknpc.json

@@ -1608,7 +1608,7 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "20030_熊猫2",
+      "功能入口-维京远征",
       "901"
     ],
     "event": [

bin/json/game_recharge.json

@@ -6,11 +6,6 @@
     "monetaryunit": "￥",
     "amount": 600,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 60
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -18,15 +13,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 60
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 120
+        "n": 30
       }
     ],
     "channel": "0",
@@ -41,11 +31,6 @@
     "monetaryunit": "￥",
     "amount": 3000,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 300
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -53,15 +38,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 300
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 600
+        "n": 150
       }
     ],
     "channel": "0",
@@ -76,11 +56,6 @@
     "monetaryunit": "￥",
     "amount": 6800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 680
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -88,15 +63,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 680
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 1360
+        "n": 340
       }
     ],
     "channel": "0",
@@ -111,11 +81,6 @@
     "monetaryunit": "￥",
     "amount": 9800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 980
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -123,15 +88,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 980
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 1960
+        "n": 490
       }
     ],
     "channel": "0",
@@ -146,11 +106,6 @@
     "monetaryunit": "￥",
     "amount": 12800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1280
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -158,15 +113,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1280
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 2560
+        "n": 640
       }
     ],
     "channel": "0",
@@ -181,11 +131,6 @@
     "monetaryunit": "￥",
     "amount": 19800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1980
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -193,15 +138,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1980
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 3960
+        "n": 990
       }
     ],
     "channel": "0",
@@ -216,11 +156,6 @@
     "monetaryunit": "￥",
     "amount": 32800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 3280
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -228,15 +163,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 3280
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 6560
+        "n": 1640
       }
     ],
     "channel": "0",
@@ -251,11 +181,6 @@
     "monetaryunit": "￥",
     "amount": 64800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 6480
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -263,15 +188,10 @@
       }
     ],
     "diamond_num_double": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 6480
-      },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 12960
+        "n": 3240
       }
     ],
     "channel": "0",
@@ -288,11 +208,17 @@
     "vipexp": [
       {
         "a": "attr",
-        "t": "vipexp",
+        "t": "diamond",
         "n": 60
       }
     ],
-    "diamond_num_double": [],
+    "diamond_num_double": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 30
+      }
+    ],
     "channel": "0",
     "text": "0",
     "show": "6元",
@@ -304,13 +230,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 600,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 60
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -323,13 +243,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 3000,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 300
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -342,13 +256,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 6800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 680
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -361,13 +269,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 12800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1280
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -380,13 +282,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 3000,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 300
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -399,13 +295,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 9800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 980
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -418,13 +308,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 19800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1980
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -437,13 +321,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 32800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 3280
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -456,13 +334,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 44800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 4480
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -475,13 +347,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 64800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 6480
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -494,13 +360,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 12800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1280
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -513,13 +373,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 19800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 1980
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -532,13 +386,7 @@
     "recharge_type": 2,
     "monetaryunit": "￥",
     "amount": 32800,
-    "vipexp": [
+    "vipexp": [],
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 3280
-      }
-    ],
     "diamond_num_double": [],
     "channel": "0",
     "text": "0",
@@ -552,11 +400,6 @@
     "monetaryunit": "￥",
     "amount": 3000,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 300
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -576,11 +419,6 @@
     "monetaryunit": "￥",
     "amount": 9800,
     "vipexp": [
-      {
-        "a": "attr",
-        "t": "vipexp",
-        "n": 980
-      },
       {
         "a": "attr",
         "t": "diamond",

bin/json/game_shopitem.json

@@ -23981,7 +23981,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 1
       }
     ],
@@ -24017,7 +24017,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000009",
+        "t": "10000005",
         "n": 1
       }
     ],
@@ -24053,7 +24053,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000010",
+        "t": "10000006",
         "n": 1
       }
     ],
@@ -25385,7 +25385,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000004",
+        "t": "10000008",
         "n": 1
       }
     ],
@@ -25395,17 +25395,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 150
+        "n": 6000
       }
     ],
     "sale": 200,
     "salelist": [
-      500,
+      200,
-      500,
+      200,
-      500,
+      200,
-      500,
+      200,
-      500,
+      200,
-      500
+      200
     ],
     "buyminnum": 1,
     "buymaxnum": 1,
@@ -25421,7 +25421,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000005",
+        "t": "10000009",
         "n": 1
       }
     ],
@@ -25457,7 +25457,7 @@
     "iteminfo": [
       {
         "a": "item",
-        "t": "10000006",
+        "t": "10000010",
         "n": 1
       }
     ],
@@ -25467,17 +25467,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 6000
+        "n": 150
       }
     ],
     "sale": 500,
     "salelist": [
-      200,
+      500,
-      200,
+      500,
-      200,
+      500,
-      200,
+      500,
-      200,
+      500,
-      200
+      500
     ],
     "buyminnum": 5,
     "buymaxnum": 5,

bin/json/game_skillatk.json

@@ -12196,7 +12196,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_113002311_1",
-      "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。"
+      "text": "食人鱼先生对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。"
     },
     "buffid": [],
     "map": ""

bin/json/game_skillbuff.json

@@ -2908,7 +2908,7 @@
     "AddEffect": false,
     "RemoveType": true,
     "NotOverlay": 0,
-    "OverlayTimes": 3,
+    "OverlayTimes": 1,
     "SameID": false,
     "golbalbufficon": "",
     "buffIcon": "ty_icon_buff_shts15",

bin/json/game_smithytask.json

@@ -166,26 +166,5 @@
         "n": 11
       }
     ]
-  },
-  {
-    "key": 10009,
-    "id_list": 9,
-    "task_display": {
-      "key": "newsmithy_task_task_display_9",
-      "text": "进行10次阵营招募"
-    },
-    "type_id": 115,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 18
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 12
-      }
-    ]
   }
 ]

bin/json/game_worldtask.json

@@ -411,7 +411,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -980,7 +980,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -1269,7 +1269,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -1542,7 +1542,7 @@
       },
       {
         "a": "item",
-        "t": "10000008",
+        "t": "10000004",
         "n": 3
       }
     ],
@@ -2133,7 +2133,7 @@
       },
       {
         "a": "item",
-        "t": "10000009",
+        "t": "10000005",
         "n": 2
       }
     ],
@@ -2647,7 +2647,7 @@
       },
       {
         "a": "item",
-        "t": "10000009",
+        "t": "10000005",
         "n": 4
       }
     ],
@@ -3279,7 +3279,7 @@
       },
       {
         "a": "item",
-        "t": "10000010",
+        "t": "10000006",
         "n": 2
       }
     ],

modules/battle/module.go

@@ -35,7 +35,7 @@ type Battle struct {
 	clientmgr   *battleClientMgrComp //c#战斗客户端端管理
 }
 
-//模块名
+// 模块名
 func (this *Battle) GetType() core.M_Modules {
 	return comm.ModuleBattle
 }
@@ -44,7 +44,7 @@ func (this *Battle) NewOptions() (options core.IModuleOptions) {
 	return new(Options)
 }
 
-//模块初始化接口 注册用户创建角色事件
+// 模块初始化接口 注册用户创建角色事件
 func (this *Battle) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
 	err = this.ModuleBase.Init(service, module, options)
 	this.service = service.(base.IRPCXService)
@@ -71,7 +71,7 @@ func (this *Battle) Start() (err error) {
 	return
 }
 
-//装备组件
+// 装备组件
 func (this *Battle) OnInstallComp() {
 	this.ModuleBase.OnInstallComp()
 	this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
@@ -80,7 +80,7 @@ func (this *Battle) OnInstallComp() {
 	this.clientmgr = this.RegisterComp(new(battleClientMgrComp)).(*battleClientMgrComp)
 }
 
-//查询战斗记录
+// 查询战斗记录
 func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var err error
 	if record, err = this.modelBattle.queryrecord(oid); err != nil {
@@ -93,7 +93,7 @@ func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record
 	return
 }
 
-//创建pve战斗
+// 创建pve战斗
 func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
@@ -120,7 +120,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE
 	return
 }
 
-//创建pve战斗
+// 创建pve战斗
 func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
@@ -153,8 +153,10 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
 			Title: pb.ErrorCode_ReqParameterError.ToString(),
 		}
 	}
+	var flag bool
 	for _, v := range req.Format.Friendformat {
 		if v != "" {
+			flag = true
 			// this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1)
 			go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1))
 			break
@@ -164,13 +166,13 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
 	if record, errdata = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); errdata != nil {
 		return
 	}
-	if req.Format.Friendformat != nil {
+	if flag {
 		go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1))
 	}
 	return
 }
 
-//创建pve战斗
+// 创建pve战斗
 func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
@@ -203,7 +205,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB
 	return
 }
 
-//创建pve战斗
+// 创建pve战斗
 func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
@@ -229,7 +231,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP
 	return
 }
 
-//只有跨服环境下才可使用
+// 只有跨服环境下才可使用
 func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		redmodel  *db.DBModel
@@ -265,7 +267,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error
 	return
 }
 
-//创建连续战斗
+// 创建连续战斗
 func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
@@ -298,8 +300,10 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP
 			Title: pb.ErrorCode_ReqParameterError.ToString(),
 		}
 	}
+	var flag bool
 	for _, v := range req.Format.Friendformat {
 		if v != "" {
+			flag = true
 			// this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1)
 			go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1))
 			break
@@ -309,19 +313,19 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP
 	if record, errdata = this.modelBattle.createlpve(session, conn, pb.BattleType_lpev, req); errdata != nil {
 		return
 	}
-	if req.Format.Friendformat != nil {
+	if flag {
 		go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1))
 	}
 	return
 }
 
-///创建角色列表 更具Format表格
+// /创建角色列表 更具Format表格
 func (this *Battle) CreateRolesByFormat(fid int32) (captain int32, roles []*pb.BattleRole, errdata *pb.ErrorData) {
 	captain, roles, errdata = this.modelBattle.createMasterRoles(2, 0, fid)
 	return
 }
 
-///创建角色列表 更具英雄列表
+// /创建角色列表 更具英雄列表
 func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRole, errdata *pb.ErrorData) {
 	roles = make([]*pb.BattleRole, len(heros))
 	for i, v := range heros {
@@ -334,7 +338,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo
 	return
 }
 
-///获取战斗详情
+// /获取战斗详情
 func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) {
 	this.Debug("GetBattleInfo", log.Field{Key: "req", Value: req})
 	var (
@@ -352,7 +356,7 @@ func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorDa
 	return
 }
 
-//创建战斗服务
+// 创建战斗服务
 func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (errdata *pb.ErrorData) {
 	this.Debug("CreateBattleServer", log.Field{Key: "req", Value: req})
 	var (
@@ -400,7 +404,7 @@ func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (errdata *pb.ErrorData)
 	return
 }
 
-//pvp认输
+// pvp认输
 func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) {
 	var (
 		resp *pb.BattleConcedeResp
@@ -422,7 +426,7 @@ func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorDa
 	return
 }
 
-//校验战报是否成功
+// 校验战报是否成功
 func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) {
 	var (
 		reply *pb.BattleCheckResults
@@ -459,5 +463,10 @@ func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.Batt
 		// this.ModuleBuried.SendToRtask(session, comm.Rtype157, int32(report.Info.Ptype), v)
 		go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype157, int32(report.Info.Ptype), v))
 	}
-	return nil, true
+
+	if (report.WinSide == 1 && report.Info.RedCompId == session.GetUserId()) || (report.WinSide == 2 && report.Info.BlueCompId == session.GetUserId()) {
+		return nil, true
+	} else {
+		return nil, false
+	}
 }

modules/hero/model_hero.go

@@ -36,7 +36,7 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor
 	return
 }
 
-//初始化英雄
+// 初始化英雄
 func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
 	heroCfg, _ := this.module.configure.GetHeroConfig(heroCfgId)
 
@@ -67,7 +67,7 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
 	return newHero
 }
 
-//初始化英雄技能
+// 初始化英雄技能
 func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
 	heroCfg, _ := this.module.configure.GetHeroConfig(hero.HeroID)
 
@@ -92,7 +92,7 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
 	return nil
 }
 
-//创建一个指定的英雄
+// 创建一个指定的英雄
 func (this *ModelHero) createSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) {
 	list := this.getHeroList(uid)
 	for _, v := range list {
@@ -132,7 +132,7 @@ func (this *ModelHero) CloneNewHero(uid string, hero *pb.DBHero) (newHero *pb.DB
 	return
 }
 
-//初始化可叠加的英雄
+// 初始化可叠加的英雄
 func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int32) (hero *pb.DBHero, err error) {
 	var (
 		model *db.DBModel
@@ -158,7 +158,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
 	return
 }
 
-//获取一个英雄(参数唯一objID)
+// 获取一个英雄(参数唯一objID)
 func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
 	hero := &pb.DBHero{}
 	err := this.GetListObj(uid, heroId, hero)
@@ -168,7 +168,7 @@ func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
 	return hero
 }
 
-//消耗英雄卡
+// 消耗英雄卡
 func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error) {
 
 	if hero == nil {
@@ -183,7 +183,7 @@ func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error)
 	return
 }
 
-//获取玩家的英雄列表
+// 获取玩家的英雄列表
 func (this *ModelHero) getHeroList(uid string) []*pb.DBHero {
 	heroes := make([]*pb.DBHero, 0)
 	err := this.GetList(uid, &heroes)
@@ -276,13 +276,16 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
 	}
 
 	for _, v := range hero.Suits {
-		if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil {
+		if v.Effect {
-			this.module.Errorln(err)
+			if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil {
-		} else {
+				this.module.Errorln(err)
-			for k, v := range configure.SetBonuses {
+			} else {
-				addProperty[k] += v
+				for k, v := range configure.SetBonuses {
+					addProperty[k] += v
+				}
 			}
 		}
+
 	}
 
 	for k, v := range addProperty {
@@ -300,7 +303,7 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
 	this.mergeAddProperty(hero.Uid, hero, addProperty, equipSkill)
 }
 
-//设置装备
+// 设置装备
 func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DBHero, err error) {
 	if len(hero.EquipID) == 0 {
 		return
@@ -316,7 +319,7 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB
 	return
 }
 
-//合并属性即属性值累加 (data 额外加的属性)
+// 合并属性即属性值累加 (data 额外加的属性)
 func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) {
 	for k, v := range hero.Property {
 		if v1, ok := data[k]; ok {
@@ -332,7 +335,7 @@ func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[s
 	return
 }
 
-//合并附加属性
+// 合并附加属性
 func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[string]int32, skills []*pb.SkillData) {
 	hero.AddProperty = data
 
@@ -373,8 +376,8 @@ func (this *ModelHero) StarHpAddition(star int32) (addValue float32) {
 	return addValue
 }
 
-//属性计算 基础属性
+// 属性计算 基础属性
-//英雄基础属性 + 英雄等级基础属性 * 英雄成长系数 + 英雄星级对应等级属性 * 英雄品质系数
+// 英雄基础属性 + 英雄等级基础属性 * 英雄成长系数 + 英雄星级对应等级属性 * 英雄品质系数
 func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
 	growCfg := this.module.configure.GetHeroLvgrow(hero.HeroID)
 	heroCfg, _ := this.module.configure.GetHeroConfig(hero.HeroID)
@@ -416,7 +419,7 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
 	this.resetJuexingProperty(hero)
 }
 
-//重新计算英雄属性
+// 重新计算英雄属性
 func (this *ModelHero) ChangeHeroProperty(session comm.IUserSession, hero *pb.DBHero) (err error) {
 	this.PropertyCompute(hero) //重新计算 property 的值
 	update := map[string]interface{}{
@@ -639,7 +642,7 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH
 	return newHero
 }
 
-//设置天赋属性
+// 设置天赋属性
 func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameHeroTalentData) {
 	if conf == nil || hero == nil {
 		return

modules/user/api_login.go

@@ -10,7 +10,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
-//参数校验
+// 参数校验
 func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) {
 	if req.Account == "" {
 		errdata = &pb.ErrorData{
@@ -21,7 +21,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq)
 	return
 }
 
-//登录
+// 登录
 func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) {
 	if errdata = this.LoginCheck(session, req); errdata != nil {
 		return
@@ -135,6 +135,8 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 			this.module.modelSign.UserSign(session)
 		}
 
+		// 判断昨日是否登录
+
 		rsp.Data = user
 
 		// 查询玩家扩展数据
@@ -150,7 +152,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		} else {
 			rsp.Ex = expand
 		}
-	} else {  //新号
+	} else { //新号
 		rsp.Ex = &pb.DBUserExpand{}
 		this.module.modelSign.UserSign(session)
 		go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))

modules/user/module.go

@@ -536,10 +536,12 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 				}
 				return
 			}
-		} else {
 			change.Ps += add
-			if change.Ps > ggd.PsUl {
+		} else {
+			if change.Ps+add > ggd.PsUl {
 				change.Ps = ggd.PsUl
+			} else {
+				change.Ps += add
 			}
 		}