配置同步

bin/json/game_battleready.json

@@ -69,7 +69,7 @@
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_02",
     "battleScenes": [
-      "scenesfight_07"
+      "bossfight_spinymandrilla_02"
     ],
     "disableAiCamera": 0,
     "DefaultHero": 0,
@@ -117,7 +117,7 @@
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_02",
     "battleScenes": [
-      "scenesfight_07"
+      "bossfight_spinymandrilla_02"
     ],
     "disableAiCamera": 0,
     "DefaultHero": 0,
@@ -357,9 +357,9 @@
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_02",
     "battleScenes": [
-      "scenesfight_07"
+      "bossfight_spinymandrilla_02"
     ],
-    "disableAiCamera": 0,
+    "disableAiCamera": 1,
     "DefaultHero": 0,
     "DisableHero": [],
     "LockSlots": [],

bin/json/game_mainstage.json

@@ -534,7 +534,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_chezhan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -622,7 +622,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -710,7 +710,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -799,7 +799,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -888,7 +888,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -977,7 +977,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1066,7 +1066,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1154,7 +1154,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1242,7 +1242,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1331,7 +1331,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1420,7 +1420,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1509,7 +1509,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1598,7 +1598,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1686,7 +1686,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1774,7 +1774,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1863,7 +1863,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -1952,7 +1952,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {
@@ -2041,7 +2041,7 @@
       "z": 0
     },
     "EditorStage": 0,
-    "detailwindow": "effect_huaidan",
+    "detailwindow": "effect_xunlong",
     "frontstoryid": 0,
     "afterstoryid": 0,
     "mainlineName": {

bin/json/game_monsterformat.json

@@ -562,8 +562,8 @@
     "Id": 101061,
     "pos": 4,
     "captainId": 1,
-    "IsBoss": 0,
+    "IsBoss": 1,
-    "bossHpCnt": 0,
+    "bossHpCnt": 4,
     "monster": 550025,
     "lv": 26,
     "hppro": 0.6,
@@ -87105,7 +87105,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": 7000111,
+    "monster": -1,
     "lv": 1,
     "hppro": 0.3,
     "atkpro": 1,
@@ -87144,7 +87144,7 @@
     "captainId": 1,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": -1,
+    "monster": 240043,
     "lv": 1,
     "hppro": 0.5,
     "atkpro": 1,
@@ -87170,10 +87170,10 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": -1,
+    "monster": 250015,
-    "lv": 2,
+    "lv": 30,
-    "hppro": 0.5,
+    "hppro": 0.8,
-    "atkpro": 1,
+    "atkpro": 1.1,
     "defpro": 0.1,
     "modelsize": 1
   },
@@ -87183,10 +87183,10 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": -1,
+    "monster": 140015,
-    "lv": 2,
+    "lv": 30,
-    "hppro": 0.5,
+    "hppro": 0.8,
-    "atkpro": 1,
+    "atkpro": 1.1,
     "defpro": 0.1,
     "modelsize": 1
   },
@@ -87196,10 +87196,10 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": 7000123,
+    "monster": 340065,
-    "lv": 2,
+    "lv": 30,
-    "hppro": 50,
+    "hppro": 0.8,
-    "atkpro": 10,
+    "atkpro": 1.1,
     "defpro": 0.1,
     "modelsize": 1
   },
@@ -87209,10 +87209,10 @@
     "captainId": 1,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": 7000124,
+    "monster": 350015,
-    "lv": 2,
+    "lv": 30,
-    "hppro": 50,
+    "hppro": 0.8,
-    "atkpro": 10,
+    "atkpro": 1.1,
     "defpro": 0.1,
     "modelsize": 1
   },
@@ -87222,10 +87222,10 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "monster": 7000125,
+    "monster": 140035,
-    "lv": 2,
+    "lv": 30,
-    "hppro": 50,
+    "hppro": 0.8,
-    "atkpro": 10,
+    "atkpro": 1.1,
     "defpro": 0.1,
     "modelsize": 1
   },

bin/json/game_rdtasknpc.json

@@ -544,5 +544,33 @@
       9060
     ],
     "goto": 0
+  },
+  {
+    "id": 80010,
+    "heroid": 34007,
+    "datas": [
+      "GameMain",
+      "功能入口-魔药",
+      "901"
+    ],
+    "event": [
+      2,
+      100010
+    ],
+    "goto": 0
+  },
+  {
+    "id": 80020,
+    "heroid": 35006,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      100020
+    ],
+    "goto": 0
   }
 ]

bin/json/game_skillbuff.json

@@ -1017,7 +1017,7 @@
     "SameID": false,
     "golbalbufficon": "",
     "buffIcon": "ty_zd_buff_z004",
-    "buffeffect": "effect_34002_skill_1_hit",
+    "buffeffect": "effect_34002_skill_1_hit_1",
     "buffpos": "胸"
   },
   {

bin/json/game_vikingbossskill.json

@@ -6,7 +6,7 @@
       "key": "viking_boss_1001",
       "text": "火焰泰坦"
     },
-    "back_png": "wjyz_img001",
+    "back_png": "wjyz_img003",
     "introduce": {
       "key": "viking_boss_1004",
       "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
@@ -24,7 +24,7 @@
       "key": "viking_boss_1002",
       "text": "冰之泰坦"
     },
-    "back_png": "wjyz_img002",
+    "back_png": "wjyz_img001",
     "introduce": {
       "key": "viking_boss_1005",
       "text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了"
@@ -42,7 +42,7 @@
       "key": "viking_boss_1003",
       "text": "森林泰坦"
     },
-    "back_png": "wjyz_img003",
+    "back_png": "wjyz_img002",
     "introduce": {
       "key": "viking_boss_1006",
       "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神"
@@ -78,7 +78,7 @@
       "key": "viking_boss_1001",
       "text": "火焰泰坦"
     },
-    "back_png": "wjyz_img001",
+    "back_png": "wjyz_img002",
     "introduce": {
       "key": "viking_boss_20001",
       "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
@@ -96,7 +96,7 @@
       "key": "viking_boss_1001",
       "text": "火焰泰坦"
     },
-    "back_png": "wjyz_img001",
+    "back_png": "xmwg_jyfb_boss1",
     "introduce": {
       "key": "viking_boss_20001",
       "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"

bin/json/game_worldtask.json

@@ -987,30 +987,30 @@
     "des": 1,
     "icon": "",
     "task_Tname": {
-      "key": "Daily_tasks4",
+      "key": "richang",
-      "text": "日常任务"
+      "text": "魔药处"
     },
     "task_name": {
-      "key": "Daily_tasks4",
+      "key": "richang",
-      "text": "1"
+      "text": "魔药处"
     },
     "npctxt": {
-      "key": "",
+      "key": "Talk_to_Fiona",
-      "text": ""
+      "text": "和菲欧娜聊聊"
     },
-    "npc": 10010,
+    "npc": 80010,
     "completetasktxt": {
-      "key": "",
+      "key": "Talk_to_Fiona",
-      "text": ""
+      "text": "和菲欧娜聊聊"
     },
     "completetask": [
       0
     ],
     "deliver_npctxt": {
-      "key": "",
+      "key": "Talk_to_Fiona",
-      "text": ""
+      "text": "和菲欧娜聊聊"
     },
-    "deliver_npc": 10012,
+    "deliver_npc": 0,
     "auto_accept": 0,
     "reword": [
       {
@@ -1031,30 +1031,30 @@
     "des": 4,
     "icon": "",
     "task_Tname": {
-      "key": "Weekly_Tasks1",
+      "key": "zhouchang",
-      "text": "周常任务"
+      "text": "烹饪处"
     },
     "task_name": {
-      "key": "Weekly_Tasks1",
+      "key": "zhouchang",
-      "text": "1"
+      "text": "烹饪处"
     },
     "npctxt": {
-      "key": "",
+      "key": "Talk_to_Peace",
-      "text": ""
+      "text": "和平先生聊聊"
     },
-    "npc": 10040,
+    "npc": 80020,
     "completetasktxt": {
-      "key": "",
+      "key": "Talk_to_Peace",
-      "text": ""
+      "text": "和平先生聊聊"
     },
     "completetask": [
       0
     ],
     "deliver_npctxt": {
-      "key": "",
+      "key": "Talk_to_Peace",
-      "text": ""
+      "text": "和平先生聊聊"
     },
-    "deliver_npc": 10082,
+    "deliver_npc": 0,
     "auto_accept": 0,
     "reword": [
       {