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

bin/json/game_arenaactivereward.json

@@ -3,7 +3,7 @@
     "lv_id": 1,
     "score_low": 0,
     "score_up": 799,
-    "human_num": 1,
+    "human_num": 0,
     "name": {
       "key": "arena_active_reward_name_1",
       "text": "黑铁"
@@ -12,22 +12,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 6
+        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 32
+    "k_value": 30
   },
   {
     "lv_id": 2,
     "score_low": 800,
-    "score_up": 1199,
+    "score_up": 1299,
-    "human_num": 1,
+    "human_num": 2,
     "name": {
       "key": "arena_active_reward_name_2",
       "text": "青铜"
@@ -36,22 +31,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 8
+        "n": 12
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 64
+    "k_value": 30
   },
   {
     "lv_id": 3,
-    "score_low": 1200,
+    "score_low": 1300,
     "score_up": 1599,
-    "human_num": 2,
+    "human_num": 3,
     "name": {
       "key": "arena_active_reward_name_3",
       "text": "白银"
@@ -60,22 +50,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 10
+        "n": 14
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 32
+    "k_value": 30
   },
   {
     "lv_id": 4,
     "score_low": 1600,
-    "score_up": 1999,
+    "score_up": 2199,
-    "human_num": 2,
+    "human_num": 4,
     "name": {
       "key": "arena_active_reward_name_4",
       "text": "黄金"
@@ -84,22 +69,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 12
+        "n": 16
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 16
+    "k_value": 30
   },
   {
     "lv_id": 5,
-    "score_low": 2000,
+    "score_low": 2200,
-    "score_up": 2399,
+    "score_up": 2799,
-    "human_num": 3,
+    "human_num": 5,
     "name": {
       "key": "arena_active_reward_name_5",
       "text": "铂金"
@@ -108,22 +88,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 14
+        "n": 18
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 8
+    "k_value": 30
   },
   {
     "lv_id": 6,
-    "score_low": 2400,
+    "score_low": 2800,
-    "score_up": 2799,
+    "score_up": 3699,
-    "human_num": 3,
+    "human_num": 5,
     "name": {
       "key": "arena_active_reward_name_6",
       "text": "钻石"
@@ -132,22 +107,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 16
+        "n": 20
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 8
+    "k_value": 30
   },
   {
     "lv_id": 7,
-    "score_low": 2800,
+    "score_low": 3700,
-    "score_up": 3199,
+    "score_up": 4599,
-    "human_num": 4,
+    "human_num": 5,
     "name": {
       "key": "arena_active_reward_name_7",
       "text": "大师"
@@ -156,22 +126,17 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 18
+        "n": 22
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 8
+    "k_value": 30
   },
   {
     "lv_id": 8,
-    "score_low": 3200,
+    "score_low": 4600,
-    "score_up": 99999999,
+    "score_up": 999999,
-    "human_num": 4,
+    "human_num": 5,
     "name": {
       "key": "arena_active_reward_name_8",
       "text": "王者"
@@ -180,15 +145,10 @@
       {
         "a": "attr",
         "t": "arenacoin",
-        "n": 20
+        "n": 22
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 5
       }
     ],
     "png": "wp_icon_bydw02",
-    "k_value": 8
+    "k_value": 30
   }
 ]

bin/json/game_arenachallengenpc.json

@@ -2,10 +2,10 @@
   {
     "id": 1,
     "open_cond": 1,
-    "open_value": 10,
+    "open_value": 6,
     "BattleReadyID": 110,
     "monsterformat_id": [
-      101011,
+      801010,
       301027
     ],
     "stroy_id_front": 201,
@@ -18,22 +18,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 10
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 2,
     "open_cond": 1,
-    "open_value": 11,
+    "open_value": 8,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101021
@@ -48,22 +53,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 10
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 3,
     "open_cond": 1,
-    "open_value": 12,
+    "open_value": 10,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101031
@@ -78,22 +88,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 12
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 4,
     "open_cond": 1,
-    "open_value": 13,
+    "open_value": 12,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101032
@@ -108,15 +123,20 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 12
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
@@ -138,22 +158,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 14
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 6,
     "open_cond": 1,
-    "open_value": 15,
+    "open_value": 16,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -168,22 +193,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 14
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 7,
     "open_cond": 1,
-    "open_value": 16,
+    "open_value": 18,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -198,22 +228,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 16
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 8,
     "open_cond": 1,
-    "open_value": 17,
+    "open_value": 20,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -228,22 +263,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 16
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 9,
     "open_cond": 1,
-    "open_value": 18,
+    "open_value": 22,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -258,22 +298,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 18
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 10,
     "open_cond": 1,
-    "open_value": 19,
+    "open_value": 24,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -288,22 +333,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 18
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 11,
     "open_cond": 1,
-    "open_value": 20,
+    "open_value": 27,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -318,22 +368,27 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 20
       }
     ],
     "new_npc_reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 30
       }
     ]
   },
   {
     "id": 12,
     "open_cond": 1,
-    "open_value": 21,
+    "open_value": 30,
     "BattleReadyID": 110,
     "monsterformat_id": [
       101041
@@ -348,135 +403,20 @@
     "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 20
       }
     ],
     "new_npc_reward": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "gold",
+        "t": "10000001",
-        "n": 20000
+        "n": 1
-      }
-    ]
       },
-  {
-    "id": 13,
-    "open_cond": 1,
-    "open_value": 22,
-    "BattleReadyID": 110,
-    "monsterformat_id": [
-      101041
-    ],
-    "stroy_id_front": 201,
-    "stroy_id_after": 201,
-    "name": {
-      "key": "arena_challenge_npc_name_13",
-      "text": "王者守护者"
-    },
-    "revive_cd": 24,
-    "npc_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 10000
+        "n": 30
-      }
-    ],
-    "new_npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 20000
-      }
-    ]
-  },
-  {
-    "id": 14,
-    "open_cond": 1,
-    "open_value": 23,
-    "BattleReadyID": 110,
-    "monsterformat_id": [
-      101041
-    ],
-    "stroy_id_front": 201,
-    "stroy_id_after": 201,
-    "name": {
-      "key": "arena_challenge_npc_name_14",
-      "text": "隐秘守护者"
-    },
-    "revive_cd": 24,
-    "npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      }
-    ],
-    "new_npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 20000
-      }
-    ]
-  },
-  {
-    "id": 15,
-    "open_cond": 1,
-    "open_value": 24,
-    "BattleReadyID": 110,
-    "monsterformat_id": [
-      101041
-    ],
-    "stroy_id_front": 201,
-    "stroy_id_after": 201,
-    "name": {
-      "key": "arena_challenge_npc_name_15",
-      "text": "传说守护者"
-    },
-    "revive_cd": 24,
-    "npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      }
-    ],
-    "new_npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 20000
-      }
-    ]
-  },
-  {
-    "id": 16,
-    "open_cond": 1,
-    "open_value": 25,
-    "BattleReadyID": 110,
-    "monsterformat_id": [
-      101041
-    ],
-    "stroy_id_front": 201,
-    "stroy_id_after": 201,
-    "name": {
-      "key": "arena_challenge_npc_name_16",
-      "text": "神话守护者"
-    },
-    "revive_cd": 24,
-    "npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      }
-    ],
-    "new_npc_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 20000
       }
     ]
   }

bin/json/game_arenarankreward.json

@@ -2,231 +2,210 @@
   {
     "id": 1,
     "rank_low": 1,
-    "rank_up": 2,
+    "rank_up": 3,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_1",
-      "text": "1-1名"
+      "text": "1-2名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 30000
+        "n": 800
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 250
+        "n": 600
       }
     ]
   },
   {
     "id": 2,
-    "rank_low": 2,
+    "rank_low": 4,
-    "rank_up": 3,
+    "rank_up": 10,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_2",
-      "text": "2-2名"
+      "text": "4-9名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 28000
+        "n": 750
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 230
+        "n": 500
       }
     ]
   },
   {
     "id": 3,
-    "rank_low": 3,
+    "rank_low": 11,
-    "rank_up": 4,
+    "rank_up": 20,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_3",
-      "text": "3-3名"
+      "text": "11-19名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 26000
+        "n": 700
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 210
+        "n": 400
       }
     ]
   },
   {
     "id": 4,
-    "rank_low": 4,
+    "rank_low": 21,
-    "rank_up": 11,
+    "rank_up": 50,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_4",
-      "text": "4-10名"
+      "text": "21-49名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 24000
+        "n": 650
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 190
+        "n": 300
       }
     ]
   },
   {
     "id": 5,
-    "rank_low": 11,
+    "rank_low": 51,
-    "rank_up": 21,
+    "rank_up": 100,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_5",
-      "text": "11-20名"
+      "text": "51-99名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 22000
+        "n": 600
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 170
+        "n": 280
       }
     ]
   },
   {
     "id": 6,
-    "rank_low": 21,
+    "rank_low": 101,
-    "rank_up": 51,
+    "rank_up": 200,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_6",
-      "text": "21-50名"
+      "text": "101-199名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 20000
+        "n": 550
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 150
+        "n": 260
       }
     ]
   },
   {
     "id": 7,
-    "rank_low": 51,
+    "rank_low": 201,
-    "rank_up": 101,
+    "rank_up": 500,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_7",
-      "text": "51-100名"
+      "text": "201-499名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 18000
+        "n": 500
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 130
+        "n": 240
       }
     ]
   },
   {
     "id": 8,
-    "rank_low": 101,
+    "rank_low": 501,
-    "rank_up": 201,
+    "rank_up": 1000,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_8",
-      "text": "101-200名"
+      "text": "501-999名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 16000
+        "n": 450
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 110
+        "n": 220
       }
     ]
   },
   {
     "id": 9,
-    "rank_low": 201,
+    "rank_low": 1001,
-    "rank_up": 501,
+    "rank_up": 2000,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_9",
-      "text": "201-500名"
+      "text": "1001-1999名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 14000
+        "n": 400
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 90
+        "n": 200
       }
     ]
   },
   {
     "id": 10,
-    "rank_low": 501,
+    "rank_low": 2001,
-    "rank_up": 1001,
+    "rank_up": 9999,
     "rank_display": {
       "key": "arena_rank_reward_rank_display_10",
-      "text": "501-1000名"
+      "text": "2001-9998名"
     },
     "rank_reward": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "arenacoin",
-        "n": 12000
+        "n": 350
       },
       {
         "a": "attr",
         "t": "diamond",
-        "n": 70
+        "n": 180
-      }
-    ]
-  },
-  {
-    "id": 11,
-    "rank_low": 1001,
-    "rank_up": 100000000,
-    "rank_display": {
-      "key": "arena_rank_reward_rank_display_11",
-      "text": "1000+"
-    },
-    "rank_reward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
       }
     ]
   }

bin/json/game_breakingbadtag.json

@@ -2,15 +2,43 @@
   {
     "Type": 1,
     "TagName": {
-      "key": "breakingbad_gourmettag_TagName_1",
+      "key": "breakingbad_gourmet_TagName_1",
-      "text": "主食"
+      "text": "点心"
     }
   },
   {
     "Type": 2,
     "TagName": {
-      "key": "breakingbad_gourmettag_TagName_2",
+      "key": "breakingbad_gourmet_TagName_2",
-      "text": "炒菜"
+      "text": "凉菜"
+    }
+  },
+  {
+    "Type": 3,
+    "TagName": {
+      "key": "breakingbad_gourmet_TagName_3",
+      "text": "热菜"
+    }
+  },
+  {
+    "Type": 4,
+    "TagName": {
+      "key": "breakingbad_gourmet_TagName_4",
+      "text": "汤"
+    }
+  },
+  {
+    "Type": 5,
+    "TagName": {
+      "key": "breakingbad_gourmet_TagName_5",
+      "text": "饮料"
+    }
+  },
+  {
+    "Type": 6,
+    "TagName": {
+      "key": "breakingbad_gourmet_TagName_6",
+      "text": "主食"
     }
   }
 ]

bin/json/game_buriedcondi.json

@@ -19827,5 +19827,175 @@
       "0",
       "0"
     ]
+  },
+  {
+    "id": 50000001,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_846",
+      "text": "使用好友助战守护者1次"
+    },
+    "type": 12,
+    "valid": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000002,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_847",
+      "text": "进行3次普通招募"
+    },
+    "type": 18,
+    "valid": 0,
+    "NPC": 0,
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000003,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_848",
+      "text": "为任意守护者提升5级"
+    },
+    "type": 24,
+    "valid": 0,
+    "NPC": 0,
+    "value": 5,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000004,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_849",
+      "text": "强化任意装备成功6次"
+    },
+    "type": 47,
+    "valid": 0,
+    "NPC": 0,
+    "value": 6,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000005,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_850",
+      "text": "消费500000金币"
+    },
+    "type": 68,
+    "valid": 0,
+    "NPC": 0,
+    "value": 500000,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000006,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_851",
+      "text": "消费300钻石"
+    },
+    "type": 104,
+    "valid": 0,
+    "NPC": 0,
+    "value": 300,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000007,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_852",
+      "text": "完成1次功夫陪练任务"
+    },
+    "type": 186,
+    "valid": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000008,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_853",
+      "text": "挑战3次竞技场"
+    },
+    "type": 130,
+    "valid": 0,
+    "NPC": 0,
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000009,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_854",
+      "text": "挑战3次“维京远征”副本"
+    },
+    "type": 172,
+    "valid": 0,
+    "NPC": 0,
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000010,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_855",
+      "text": "挑战3次“狩猎”副本"
+    },
+    "type": 200,
+    "valid": 0,
+    "NPC": 0,
+    "value": 3,
+    "filter": [],
+    "filter2": []
   }
 ]

bin/json/game_buriedtype.json

@@ -1138,5 +1138,10 @@
     "filter": [
       "eq"
     ]
+  },
+  {
+    "id": 200,
+    "insert": 2,
+    "filter": []
   }
 ]

bin/json/game_global.json

@@ -733,6 +733,18 @@
     "buzkashi_bumpdis": 5,
     "stamina_potion": 10000003,
     "fight_ps": 3,
-    "player_bodychange": 20170
+    "player_bodychange": 20160,
+    "mryl_reward": [
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 30
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 50000
+      }
+    ]
   }
 ]

bin/json/game_guildactivity.json

@@ -1,56 +1,56 @@
 [
   {
     "id": 1,
-    "activity": 1000,
+    "activity": 300,
     "reward": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "10000005",
-        "n": 50
+        "n": 10
       }
     ]
   },
   {
     "id": 2,
-    "activity": 2000,
+    "activity": 600,
     "reward": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "10000003",
-        "n": 60
+        "n": 2
       }
     ]
   },
   {
     "id": 3,
-    "activity": 3000,
+    "activity": 1000,
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "gold",
-        "n": 70
+        "n": 600000
       }
     ]
   },
   {
     "id": 4,
-    "activity": 4000,
+    "activity": 1500,
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "gold",
-        "n": 80
+        "n": 1500000
       }
     ]
   },
   {
     "id": 5,
-    "activity": 5000,
+    "activity": 2000,
     "reward": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "10000003",
-        "n": 100
+        "n": 3
       }
     ]
   }

bin/json/game_guildlv.json

@@ -1,102 +1,57 @@
 [
   {
     "lv": 1,
-    "exp": 0,
+    "exp": 1200,
-    "member_max": 22
+    "member_max": 20
   },
   {
     "lv": 2,
-    "exp": 1000,
+    "exp": 2520,
-    "member_max": 24
+    "member_max": 21
   },
   {
     "lv": 3,
-    "exp": 2000,
+    "exp": 3960,
-    "member_max": 26
+    "member_max": 22
   },
   {
     "lv": 4,
-    "exp": 3000,
+    "exp": 5520,
-    "member_max": 28
+    "member_max": 23
   },
   {
     "lv": 5,
-    "exp": 4000,
+    "exp": 7200,
-    "member_max": 30
+    "member_max": 24
   },
   {
     "lv": 6,
-    "exp": 5000,
+    "exp": 9000,
-    "member_max": 32
+    "member_max": 25
   },
   {
     "lv": 7,
-    "exp": 6000,
+    "exp": 10920,
-    "member_max": 34
+    "member_max": 26
   },
   {
     "lv": 8,
-    "exp": 7000,
+    "exp": 12960,
-    "member_max": 36
+    "member_max": 27
   },
   {
     "lv": 9,
-    "exp": 8000,
+    "exp": 15120,
-    "member_max": 38
+    "member_max": 28
   },
   {
     "lv": 10,
-    "exp": 9000,
+    "exp": 18000,
-    "member_max": 40
+    "member_max": 29
   },
   {
     "lv": 11,
-    "exp": 10000,
+    "exp": 0,
-    "member_max": 42
+    "member_max": 30
-  },
-  {
-    "lv": 12,
-    "exp": 11000,
-    "member_max": 44
-  },
-  {
-    "lv": 13,
-    "exp": 12000,
-    "member_max": 46
-  },
-  {
-    "lv": 14,
-    "exp": 13000,
-    "member_max": 48
-  },
-  {
-    "lv": 15,
-    "exp": 14000,
-    "member_max": 50
-  },
-  {
-    "lv": 16,
-    "exp": 15000,
-    "member_max": 52
-  },
-  {
-    "lv": 17,
-    "exp": 16000,
-    "member_max": 54
-  },
-  {
-    "lv": 18,
-    "exp": 17000,
-    "member_max": 56
-  },
-  {
-    "lv": 19,
-    "exp": 18000,
-    "member_max": 58
-  },
-  {
-    "lv": 20,
-    "exp": 19000,
-    "member_max": 60
   }
 ]

bin/json/game_guildsign.json

@@ -10,13 +10,18 @@
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "guildcoin",
-        "n": 10
+        "n": 50
       },
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "ps",
-        "n": 10
+        "n": 5
+      },
+      {
+        "a": "item",
+        "t": "17060006",
+        "n": 4
       }
     ],
     "exp": {
@@ -36,13 +41,18 @@
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "guildcoin",
-        "n": 50
+        "n": 75
       },
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "ps",
-        "n": 50
+        "n": 10
+      },
+      {
+        "a": "item",
+        "t": "17060007",
+        "n": 2
       }
     ],
     "exp": {
@@ -62,13 +72,18 @@
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "guildcoin",
         "n": 100
       },
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "ps",
-        "n": 100
+        "n": 15
+      },
+      {
+        "a": "item",
+        "t": "17060008",
+        "n": 1
       }
     ],
     "exp": {
@@ -88,13 +103,18 @@
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "guildcoin",
-        "n": 150
+        "n": 100
       },
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "ps",
-        "n": 150
+        "n": 15
+      },
+      {
+        "a": "item",
+        "t": "17060008",
+        "n": 1
       }
     ],
     "exp": {
@@ -114,13 +134,18 @@
     "reward": [
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "guildcoin",
-        "n": 200
+        "n": 100
       },
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "ps",
-        "n": 200
+        "n": 15
+      },
+      {
+        "a": "item",
+        "t": "17060008",
+        "n": 1
       }
     ],
     "exp": {

bin/json/game_guildtask.json

@@ -1,44 +1,10 @@
 [
   {
-    "type_id": 5011001,
+    "type_id": 50000001,
     "id_list": 1,
     "jump_interface": 115,
     "task_display": {
       "key": "guild_guild_task_task_display_1",
-      "text": "赠送3次友情点"
-    },
-    "reward": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 50
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 50000
-      }
-    ],
-    "sociaty_reward": [
-      {
-        "a": "attr",
-        "t": "guildactive",
-        "n": 20
-      },
-      {
-        "a": "attr",
-        "t": "guildexp",
-        "n": 20
-      }
-    ],
-    "contribution": 50
-  },
-  {
-    "type_id": 5012001,
-    "id_list": 2,
-    "jump_interface": 113,
-    "task_display": {
-      "key": "guild_guild_task_task_display_2",
       "text": "使用好友助战守护者1次"
     },
     "reward": [
@@ -50,30 +16,64 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
       }
     ],
     "contribution": 50
   },
   {
-    "type_id": 5018001,
+    "type_id": 50000002,
+    "id_list": 2,
+    "jump_interface": 113,
+    "task_display": {
+      "key": "guild_guild_task_task_display_2",
+      "text": "进行3次普通招募"
+    },
+    "reward": [
+      {
+        "a": "attr",
+        "t": "guildcoin",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "sociaty_reward": [
+      {
+        "a": "attr",
+        "t": "guildactive",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "guildexp",
+        "n": 10
+      }
+    ],
+    "contribution": 50
+  },
+  {
+    "type_id": 50000003,
     "id_list": 3,
     "jump_interface": 107,
     "task_display": {
       "key": "guild_guild_task_task_display_3",
-      "text": "进行一次普通招募"
+      "text": "为任意守护者提升5级"
     },
     "reward": [
       {
@@ -84,63 +84,29 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
       }
     ],
     "contribution": 50
   },
   {
-    "type_id": 5024001,
+    "type_id": 50000004,
     "id_list": 4,
     "jump_interface": 103,
     "task_display": {
       "key": "guild_guild_task_task_display_4",
-      "text": "为任意守护者提升1级"
-    },
-    "reward": [
-      {
-        "a": "attr",
-        "t": "guildcoin",
-        "n": 50
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 50000
-      }
-    ],
-    "sociaty_reward": [
-      {
-        "a": "attr",
-        "t": "guildactive",
-        "n": 20
-      },
-      {
-        "a": "attr",
-        "t": "guildexp",
-        "n": 20
-      }
-    ],
-    "contribution": 50
-  },
-  {
-    "type_id": 5047001,
-    "id_list": 5,
-    "jump_interface": 103,
-    "task_display": {
-      "key": "guild_guild_task_task_display_5",
       "text": "强化任意装备成功6次"
     },
     "reward": [
@@ -152,30 +118,64 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
       }
     ],
     "contribution": 50
   },
   {
-    "type_id": 5063001,
+    "type_id": 50000005,
+    "id_list": 5,
+    "jump_interface": 11006,
+    "task_display": {
+      "key": "guild_guild_task_task_display_5",
+      "text": "消费500000金币"
+    },
+    "reward": [
+      {
+        "a": "attr",
+        "t": "guildcoin",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "sociaty_reward": [
+      {
+        "a": "attr",
+        "t": "guildactive",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "guildexp",
+        "n": 10
+      }
+    ],
+    "contribution": 50
+  },
+  {
+    "type_id": 50000006,
     "id_list": 6,
-    "jump_interface": 109,
+    "jump_interface": 11007,
     "task_display": {
       "key": "guild_guild_task_task_display_6",
-      "text": "日常任务活跃达到100"
+      "text": "消费300钻石"
     },
     "reward": [
       {
@@ -186,30 +186,30 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
       }
     ],
     "contribution": 50
   },
   {
-    "type_id": 5068001,
+    "type_id": 50000007,
     "id_list": 7,
-    "jump_interface": 122,
+    "jump_interface": 10006,
     "task_display": {
       "key": "guild_guild_task_task_display_7",
-      "text": "消费200000金币"
+      "text": "完成1次功夫派遣任务"
     },
     "reward": [
       {
@@ -220,30 +220,30 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
       }
     ],
     "contribution": 50
   },
   {
-    "type_id": 5104001,
+    "type_id": 50000008,
     "id_list": 8,
-    "jump_interface": 123,
+    "jump_interface": 156,
     "task_display": {
       "key": "guild_guild_task_task_display_8",
-      "text": "消费100钻石"
+      "text": "挑战3次竞技场"
     },
     "reward": [
       {
@@ -254,19 +254,87 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 50000
+        "n": 100000
       }
     ],
     "sociaty_reward": [
       {
         "a": "attr",
         "t": "guildactive",
-        "n": 20
+        "n": 10
       },
       {
         "a": "attr",
         "t": "guildexp",
-        "n": 20
+        "n": 10
+      }
+    ],
+    "contribution": 50
+  },
+  {
+    "type_id": 50000009,
+    "id_list": 9,
+    "jump_interface": 11012,
+    "task_display": {
+      "key": "guild_guild_task_task_display_9",
+      "text": "挑战3次“维京远征”副本"
+    },
+    "reward": [
+      {
+        "a": "attr",
+        "t": "guildcoin",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "sociaty_reward": [
+      {
+        "a": "attr",
+        "t": "guildactive",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "guildexp",
+        "n": 10
+      }
+    ],
+    "contribution": 50
+  },
+  {
+    "type_id": 50000010,
+    "id_list": 10,
+    "jump_interface": 168,
+    "task_display": {
+      "key": "guild_guild_task_task_display_10",
+      "text": "挑战3次“狩猎”副本"
+    },
+    "reward": [
+      {
+        "a": "attr",
+        "t": "guildcoin",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ],
+    "sociaty_reward": [
+      {
+        "a": "attr",
+        "t": "guildactive",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "guildexp",
+        "n": 10
       }
     ],
     "contribution": 50

bin/json/game_initial.json

@@ -1658,5 +1658,15 @@
         "n": 1
       }
     ]
+  },
+  {
+    "index": "356",
+    "var": [
+      {
+        "a": "attr",
+        "t": "starcoin",
+        "n": 500
+      }
+    ]
   }
 ]

bin/json/game_monsterformat.json

@@ -863,8 +863,8 @@
     "Id": 101033,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": -1,
     "star": 3,
     "equip": [],
@@ -8463,8 +8463,8 @@
     "Id": 104051,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": 24004,
     "star": 4,
     "equip": [],
@@ -29663,8 +29663,8 @@
     "Id": 121033,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": -1,
     "star": 3,
     "equip": [],
@@ -37263,8 +37263,8 @@
     "Id": 124051,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": 24004,
     "star": 4,
     "equip": [],
@@ -58463,8 +58463,8 @@
     "Id": 141033,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": -1,
     "star": 3,
     "equip": [],
@@ -66063,8 +66063,8 @@
     "Id": 144051,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": 24004,
     "star": 4,
     "equip": [],
@@ -87263,8 +87263,8 @@
     "Id": 161033,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": -1,
     "star": 3,
     "equip": [],
@@ -94863,8 +94863,8 @@
     "Id": 164051,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 1,
+    "IsBoss": 0,
-    "bossHpCnt": 4,
+    "bossHpCnt": 0,
     "heroid": 24004,
     "star": 4,
     "equip": [],

bin/json/game_shop.json

@@ -22,9 +22,9 @@
         "n": 1
       }
     ],
-    "rtype": 1,
+    "rtype": 2,
     "rtime": 6,
-    "rnum": 10,
+    "rnum": 8,
     "rneed": [
       {
         "a": "attr",
@@ -34,13 +34,15 @@
     ],
     "shopitem": [
       10001,
-      10002,
+      10001,
-      10003,
+      10001,
-      10004,
+      10001,
-      10005,
+      10001,
-      10006,
+      10001,
-      10007,
+      10001,
-      10008
+      10001,
+      10001,
+      10001
     ]
   },
   {
@@ -66,16 +68,12 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      20001,
+      11001,
-      20002,
+      11002,
-      20003,
+      11003,
-      20004,
+      11004,
-      20005,
+      11005,
-      20006,
+      11006
-      20007,
-      20008,
-      20009,
-      20010
     ]
   },
   {
@@ -106,9 +104,12 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      30001,
+      12001,
-      30002,
+      12002,
-      30003
+      12003,
+      12004,
+      12005,
+      12006
     ]
   },
   {
@@ -139,9 +140,13 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      40001,
+      13001,
-      40002,
+      13002,
-      40003
+      13003,
+      13004,
+      13005,
+      13006,
+      13007
     ]
   },
   {
@@ -172,10 +177,12 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      50001,
+      14001,
-      50002,
+      14002,
-      50003,
+      14003,
-      50004
+      14004,
+      14005,
+      14006
     ]
   },
   {
@@ -196,14 +203,20 @@
         "n": 1
       }
     ],
-    "rtype": 3,
+    "rtype": 4,
     "rtime": 1,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      60001,
+      15001,
-      60002,
+      15002,
-      60003
+      15003,
+      15004,
+      15005,
+      15006,
+      15007,
+      15008,
+      15009
     ]
   },
   {
@@ -229,19 +242,19 @@
     "rnum": -1,
     "rneed": [],
     "shopitem": [
-      70001,
+      16001,
-      70002,
+      16002,
-      70003,
+      16003,
-      70004,
+      16004,
-      70005,
+      16005,
-      70006,
+      16006,
-      70007,
+      16007,
-      70008,
+      16008,
-      70009,
+      16009,
-      70010,
+      16010,
-      70011,
+      16011,
-      70012,
+      16012,
-      70013
+      16013
     ]
   }
 ]

bin/json/game_skillafteratk.json

@@ -28911,7 +28911,7 @@
     "Argu": [
       1,
       4,
-      2600
+      1000
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -29205,7 +29205,7 @@
     "Argu": [
       1,
       4,
-      12000
+      1500
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29263,30 +29263,6 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
-  {
-    "Id": 255007215,
-    "EmitPR": 1000,
-    "From": 3,
-    "Where": [],
-    "Order": "",
-    "Limit": 10,
-    "ExecuteCnt": 1,
-    "Type": 3,
-    "Argu": [
-      390001451,
-      1000,
-      1,
-      -1
-    ],
-    "FollowSK": [],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
   {
     "Id": 255007311,
     "EmitPR": 1000,
@@ -29327,10 +29303,7 @@
       -1
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      255007316,
-      255007317
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -29350,8 +29323,8 @@
     "Argu": [
       390001415,
       1000,
-      1,
+      0,
-      0
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29373,8 +29346,8 @@
     "Type": 2,
     "Argu": [
       455007314,
-      1,
+      -1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29401,7 +29374,10 @@
       1
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      255007316,
+      255007317
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -29459,6 +29435,30 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 255007318,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001451,
+      1000,
+      1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 253003111,
     "EmitPR": 1000,

bin/json/game_skillatk.json

@@ -22010,8 +22010,7 @@
     "ChildSkill": {
       "Id": [
         255007211,
-        255007213,
+        255007213
-        255007215
       ]
     },
     "Desc": {
@@ -22037,18 +22036,19 @@
     "Type": 2,
     "CD": 2,
     "Where": [],
-    "Target": 0,
+    "Target": 2,
     "ChildSkill": {
       "Id": [
         255007311,
         255007312,
         255007313,
-        255007314
+        255007314,
+        255007318
       ]
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_155007311_1",
-      "text": "冰霜泰坦拥有多层生命值，且[color=#37d8a9]免疫[/color]行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
+      "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的25%。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
     },
     "buffid": [],
     "map": ""
@@ -22065,7 +22065,7 @@
     "ico": "jn_55007_3",
     "CorrectPos": 0,
     "IsMelee": 0,
-    "act": "Skill_3",
+    "act": "Skill_1",
     "Type": 0,
     "CD": 0,
     "Where": [],
@@ -22077,7 +22077,7 @@
     },
     "Desc": {
       "key": "skill_skill_atk_Desc_155007312_1",
-      "text": "冰霜泰坦拥有多层生命值，且[color=#37d8a9]免疫[/color]行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
+      "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%[/color]。并且冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]冰霜宝石[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#c84a32]灾祸冰原[/color]状态，随后触发技能1附带的效果。若施加[color=#c84a32]灾祸冰原[/color]时，自身拥有增益状态，则降低目标25%生命上限。"
     },
     "buffid": [],
     "map": ""

bin/json/game_skillbuff.json

@@ -1547,7 +1547,7 @@
     "Effect": [
       3
     ],
-    "AddEffect": false,
+    "AddEffect": true,
     "RemoveType": false,
     "NotOverlay": 1,
     "OverlayTimes": 5,
@@ -3077,7 +3077,7 @@
     },
     "BuffType": 0,
     "EffectArgu": [
-      350
+      250
     ],
     "BufParNum": 0,
     "RelyCheckArgu": [],
@@ -3238,7 +3238,7 @@
     "AddEffect": false,
     "RemoveType": false,
     "NotOverlay": 0,
-    "OverlayTimes": 0,
+    "OverlayTimes": 1,
     "SameID": false,
     "golbalbufficon": "",
     "buffIcon": "",

sys/configure/structs/game.globalData.go

@@ -236,6 +236,7 @@ type GameGlobalData struct {
     StaminaPotion int32
     FightPs int32
     PlayerBodychange int32
+    MrylReward []*Gameatn
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -951,6 +952,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["player_bodychange"].(float64); !_ok_ { err = errors.New("player_bodychange error"); return }; _v.PlayerBodychange = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["mryl_reward"].([]interface{}); !_ok_ { err = errors.New("mryl_reward error"); return }
+
+                _v.MrylReward = make([]*Gameatn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Gameatn
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+                    _v.MrylReward = append(_v.MrylReward, _list_v_)
+                }
+            }
+
     return
 }