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

bin/json/game_buriedcondi.json

@@ -20635,7 +20635,7 @@
       "t": "gold",
       "n": 1
     },
-    "NPC": 111,
+    "NPC": 10064,
     "value": 1,
     "filter": [],
     "filter2": [

bin/json/game_rdtasknpc.json

@@ -579,14 +579,16 @@
   },
   {
     "id": 10064,
-    "heroid": 0,
+    "heroid": 45001,
     "Levelid": 0,
     "datas": [
       "GameMain",
+      "20060-乌龟大师",
       "901"
     ],
     "event": [
-      0
+      2,
+      10132
     ],
     "goto": 0
   },

bin/json/game_recharge.json

@@ -446,7 +446,7 @@
   {
     "id": "passcheck_1",
     "editionid": "debug",
-    "recharge_type": 4,
+    "recharge_type": 5,
     "monetaryunit": "￥",
     "amount": 9800,
     "vipexp": [],
@@ -460,7 +460,7 @@
   {
     "id": "passcheck_2",
     "editionid": "debug",
-    "recharge_type": 4,
+    "recharge_type": 5,
     "monetaryunit": "￥",
     "amount": 9800,
     "vipexp": [],
@@ -488,7 +488,7 @@
   {
     "id": "passcheck_3",
     "editionid": "debug",
-    "recharge_type": 6,
+    "recharge_type": 5,
     "monetaryunit": "￥",
     "amount": 3000,
     "vipexp": [],
@@ -502,7 +502,7 @@
   {
     "id": "passcheck_4",
     "editionid": "debug",
-    "recharge_type": 6,
+    "recharge_type": 5,
     "monetaryunit": "￥",
     "amount": 6800,
     "vipexp": [],
@@ -514,11 +514,11 @@
     "integral": 3300
   },
   {
-    "id": "passcheck_5",
+    "id": "fund_1",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
-    "amount": 128000,
+    "amount": 3000,
     "vipexp": [],
     "diamond_num_double": [],
     "channel": "0",
@@ -528,7 +528,35 @@
     "integral": 3400
   },
   {
-    "id": "passcheck_6",
+    "id": "fund_2",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 0
+  },
+  {
+    "id": "fund_3",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 0
+  },
+  {
+    "id": "fund_4",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -542,7 +570,7 @@
     "integral": 3500
   },
   {
-    "id": "passcheck_7",
+    "id": "fund_5",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -556,7 +584,7 @@
     "integral": 3600
   },
   {
-    "id": "passcheck_8",
+    "id": "fund_6",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -570,7 +598,7 @@
     "integral": 3700
   },
   {
-    "id": "passcheck_9",
+    "id": "fund_7",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -584,7 +612,7 @@
     "integral": 3800
   },
   {
-    "id": "passcheck_10",
+    "id": "fund_8",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -598,7 +626,7 @@
     "integral": 3600
   },
   {
-    "id": "passcheck_11",
+    "id": "fund_9",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",
@@ -612,7 +640,7 @@
     "integral": 3700
   },
   {
-    "id": "passcheck_12",
+    "id": "fund_10",
     "editionid": "debug",
     "recharge_type": 6,
     "monetaryunit": "￥",

bin/json/game_shopcentercontrol.json

@@ -17,7 +17,7 @@
       "key": "supermarket_overall_slogan_1",
       "text": "[color=#ffffff]购买礼包并通关所有简单模式主线[/color]<br>总计可获得超值[color=#2bb496][size=62]3000%[/size][/color]奖励！"
     },
-    "point": "passcheck_3",
+    "point": "fund_1",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -45,7 +45,7 @@
       "key": "supermarket_overall_slogan_2",
       "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！"
     },
-    "point": "passcheck_4",
+    "point": "fund_2",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -73,7 +73,7 @@
       "key": "supermarket_overall_slogan_3",
       "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！"
     },
-    "point": "passcheck_5",
+    "point": "fund_3",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -101,7 +101,7 @@
       "key": "supermarket_overall_slogan_4",
       "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！"
     },
-    "point": "passcheck_6",
+    "point": "fund_4",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -129,7 +129,7 @@
       "key": "supermarket_overall_slogan_5",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_7",
+    "point": "fund_5",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -157,7 +157,7 @@
       "key": "supermarket_overall_slogan_6",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_8",
+    "point": "fund_6",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -185,7 +185,7 @@
       "key": "supermarket_overall_slogan_7",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_9",
+    "point": "fund_7",
     "props": [],
     "restriction": 1,
     "lv": 1,
@@ -213,7 +213,7 @@
       "key": "supermarket_overall_slogan_8",
       "text": "购买首充礼包，累计返利4888%"
     },
-    "point": "passcheck_10",
+    "point": "fund_8",
     "props": [
       {
         "a": "hero",
@@ -247,7 +247,7 @@
       "key": "supermarket_overall_slogan_9",
       "text": "购买首充礼包，累计返利1688%"
     },
-    "point": "passcheck_11",
+    "point": "fund_9",
     "props": [
       {
         "a": "item",
@@ -281,7 +281,7 @@
       "key": "supermarket_overall_slogan_10",
       "text": "购买首充礼包，累计返利1088%"
     },
-    "point": "passcheck_12",
+    "point": "fund_10",
     "props": [
       {
         "a": "item",

bin/json/game_vikingreward.json

@@ -5,7 +5,7 @@
     "rank_up": 1,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_1",
-      "text": "1-1名"
+      "text": "1"
     },
     "rank_reward": [
       {
@@ -26,7 +26,7 @@
     "rank_up": 2,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_2",
-      "text": "2-2名"
+      "text": "2"
     },
     "rank_reward": [
       {
@@ -47,7 +47,7 @@
     "rank_up": 3,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_3",
-      "text": "3-3名"
+      "text": "3"
     },
     "rank_reward": [
       {