diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json index 654f75c4f..f24e4901c 100644 --- a/shared/resource/jsons/dic_army_bossBase.json +++ b/shared/resource/jsons/dic_army_bossBase.json @@ -5,7 +5,7 @@ "level": 1, "bossLevel": 10, "basicDividend": 500, - "warIdHP": "8001&10000000&60|8008&10000000&60", + "warIdHP": "8001&10000000&450|8008&10000000&450", "rewards": 1, "consume": 30000, "buildWords": "&", @@ -24,7 +24,7 @@ "level": 2, "bossLevel": 20, "basicDividend": 700, - "warIdHP": "8009&20000000&60|8010&20000000&60|8016&20000000&60", + "warIdHP": "8009&20000000&500|8010&20000000&500|8016&20000000&500", "rewards": 1, "consume": 75000, "buildWords": "&", @@ -43,7 +43,7 @@ "level": 3, "bossLevel": 30, "basicDividend": 900, - "warIdHP": "8017&30000000&60|8018&30000000&60|8024&30000000&60", + "warIdHP": "8017&30000000&550|8018&30000000&550|8024&30000000&550", "rewards": 2, "consume": 210000, "buildWords": "&", @@ -62,7 +62,7 @@ "level": 4, "bossLevel": 40, "basicDividend": 1000, - "warIdHP": "8025&40000000&60|8026&40000000&60|8027&40000000&60|8032&40000000&60", + "warIdHP": "8025&40000000&600|8026&40000000&600|8027&40000000&600|8032&40000000&600", "rewards": 2, "consume": 480000, "buildWords": "&", @@ -81,7 +81,7 @@ "level": 5, "bossLevel": 50, "basicDividend": 1100, - "warIdHP": "8033&50000000&60|8034&50000000&60|8035&50000000&60|8040&50000000&60", + "warIdHP": "8033&50000000&650|8034&50000000&650|8035&50000000&650|8040&50000000&650", "rewards": 2, "consume": 1020000, "buildWords": "&", @@ -100,7 +100,7 @@ "level": 6, "bossLevel": 60, "basicDividend": 1200, - "warIdHP": "8041&60000000&60|8042&60000000&60|8043&60000000&60|8044&60000000&60|8048&60000000&60", + "warIdHP": "8041&60000000&700|8042&60000000&700|8043&60000000&700|8044&60000000&700|8048&60000000&700", "rewards": 2, "consume": 2100000, "buildWords": "&", @@ -119,7 +119,7 @@ "level": 7, "bossLevel": 70, "basicDividend": 1300, - "warIdHP": "8049&70000000&60|8050&70000000&60|8051&70000000&60|8052&70000000&60|8056&70000000&60", + "warIdHP": "8049&70000000&750|8050&70000000&750|8051&70000000&750|8052&70000000&750|8056&70000000&750", "rewards": 3, "consume": 3675000, "buildWords": "&", @@ -138,7 +138,7 @@ "level": 8, "bossLevel": 80, "basicDividend": 1400, - "warIdHP": "8057&80000000&60|8058&80000000&60|8059&80000000&60|8060&80000000&60|8061&80000000&60|8064&80000000&60", + "warIdHP": "8057&80000000&800|8058&80000000&800|8059&80000000&800|8060&80000000&800|8061&80000000&800|8064&80000000&800", "rewards": 3, "consume": 5475000, "buildWords": "&", @@ -157,7 +157,7 @@ "level": 9, "bossLevel": 90, "basicDividend": 1500, - "warIdHP": "8065&90000000&60|8066&90000000&60|8067&90000000&60|8068&90000000&60|8069&90000000&60|8070&90000000&60|8072&90000000&60", + "warIdHP": "8065&90000000&850|8066&90000000&850|8067&90000000&850|8068&90000000&850|8069&90000000&850|8070&90000000&850|8072&90000000&850", "rewards": 3, "consume": 8175000, "buildWords": "&", @@ -176,7 +176,7 @@ "level": 10, "bossLevel": 100, "basicDividend": 1600, - "warIdHP": "8073&100000000&60|8074&100000000&60|8075&100000000&60|8076&100000000&60|8077&100000000&60|8078&100000000&60|8079&100000000&60|8080&100000000&60", + "warIdHP": "8073&100000000&900|8074&100000000&900|8075&100000000&900|8076&100000000&900|8077&100000000&900|8078&100000000&900|8079&100000000&900|8080&100000000&900", "rewards": 3, "consume": 0, "buildWords": "&", diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index 85384de70..652dd6304 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -3638,7 +3638,7 @@ "redPoint": 0, "decomposeItem": "&", "hid": 0, - "getWays": "149|84|89|90|117|6", + "getWays": "149|84|89|117", "useWays": "36&", "value": 0, "condition": 0, @@ -4702,7 +4702,7 @@ "redPoint": 0, "decomposeItem": "&", "hid": 0, - "getWays": "&", + "getWays": "29&", "useWays": "29&", "value": 0, "condition": 0, diff --git a/shared/resource/jsons/dic_zyz_approach.json b/shared/resource/jsons/dic_zyz_approach.json index 785d63960..add858445 100644 --- a/shared/resource/jsons/dic_zyz_approach.json +++ b/shared/resource/jsons/dic_zyz_approach.json @@ -138,9 +138,9 @@ "id": 16, "type": 16, "typeName": "PVP", - "name": "pvp初始界面", - "description": "竞技", - "icon": "juntuan_jingji", + "name": "巅峰演武", + "description": "巅峰演武", + "icon": "zhujiem_jingji2", "comment": 0 }, { @@ -203,7 +203,7 @@ "typeName": "RECHARGE", "name": "充值初始界面", "description": "充值活动", - "icon": "&", + "icon": "huodong_chongzhi", "comment": 0 }, { @@ -212,7 +212,7 @@ "typeName": "HAPPY_DAY_ACTIVITY", "name": "714天乐界面", "description": "714天乐活动", - "icon": "&", + "icon": "shuangzhoule", "comment": 0 }, { @@ -221,7 +221,7 @@ "typeName": "TREASURE_HUNT_ACTIVITY", "name": "神州探秘界面", "description": "神州探秘", - "icon": "&", + "icon": "huodong_sztm", "comment": 0 }, { @@ -230,7 +230,7 @@ "typeName": "MI_JIA_SHOP_ACTIVITY", "name": "糜家商队界面", "description": "糜家商队", - "icon": "&", + "icon": "huodong_mjsd", "comment": 0 }, { @@ -238,8 +238,8 @@ "type": 27, "typeName": "BIG_TARGET_ACTIVITY", "name": "30或者更多天活动界面", - "description": "30或者更多天活动界面", - "icon": 0, + "description": "初露锋芒", + "icon": "chulufengmang", "comment": 0 }, { @@ -248,7 +248,7 @@ "typeName": "FESTIVAL_ACTIVITY", "name": "节日活动界面", "description": "节日活动", - "icon": "&", + "icon": "huodong_jrhd", "comment": 0 }, { @@ -257,7 +257,7 @@ "typeName": "NEW_HEROS_ACTIVITY", "name": "新武将活动界面", "description": "新武将活动", - "icon": "&", + "icon": "huodong_xjzq", "comment": 0 }, { @@ -744,7 +744,7 @@ "name": "秘境主界面", "description": "秘境", "icon": "tiaozhan_mijing", - "comment": "83&物品id 显示关卡名，如怒狼洞穴1\r\n若该道具有可扫荡的关卡，则跳转至可扫荡的最新关卡；若无可扫荡的关卡，则跳转至有该道具的可挑战的最新关卡；若既没有可扫荡，且挑战关卡未解锁，则按钮置灰显示未解锁，点击后提示解锁条件" + "comment": 0 }, { "id": 84, @@ -814,16 +814,16 @@ "type": 91, "typeName": "RECHARGE_TIMES", "name": "充值——限购", - "description": "充值—限购", + "description": "每日限购", "icon": "huodong_chongzhi", - "comment": "每日限购：91&0\r\n每周限购：91&1" + "comment": 0 }, { "id": 92, "type": 92, "typeName": "RECHARGE_MONTH_CARD", "name": "充值——月卡", - "description": "充值—月卡", + "description": "宝盒", "icon": "huodong_chongzhi", "comment": 0 }, @@ -832,7 +832,7 @@ "type": 93, "typeName": "RECHARGE_RECHARGE", "name": "充值——充值", - "description": "充值—充值", + "description": "元宝充值", "icon": "huodong_chongzhi", "comment": 0 }, @@ -841,7 +841,7 @@ "type": 94, "typeName": "RECHARGE_JOB", "name": "充值——官职", - "description": "充值—官职", + "description": "官职", "icon": "huodong_chongzhi", "comment": 0 }, @@ -850,8 +850,8 @@ "type": 95, "typeName": "ACTIVITY_LIST_MAIN_REWARD", "name": "活动列表——主线战令", - "description": "主线战令", - "icon": "&", + "description": "主线密卷", + "icon": "huodong_mijuan", "comment": 0 }, { @@ -859,8 +859,8 @@ "type": 96, "typeName": "ACTIVITY_LIST_TOWER_REWARD", "name": "活动列表——天梯战令", - "description": "天梯战令", - "icon": "&", + "description": "镇念塔密卷", + "icon": "huodong_mijuan", "comment": 0 }, { @@ -868,8 +868,8 @@ "type": 97, "typeName": "ACTIVITY_LIST_BATTLER_MAIN_REWARD", "name": "活动列表——精英战令", - "description": "精英战令", - "icon": "&", + "description": "梦魇密卷", + "icon": "huodong_mijuan", "comment": 0 }, { @@ -923,7 +923,7 @@ "typeName": "ACTIVITY_LIST_MEAL", "name": "活动列表——用膳", "description": "用膳", - "icon": "&", + "icon": "yongshan", "comment": 0 }, { @@ -1194,7 +1194,7 @@ "name": "优先武将升星", "description": "武将养成", "icon": "wujiang_shengxing", - "comment": "优先前往可升星武将 , 有传将魂id则优先去这个将魂对应的武将，如果没有该武将则去这个武将的合成，如果不足够合成则弹出将魂的获取途径；不传将魂则优先前往最先可升星的武将；\r\n有传觉醒石，则优先去可用觉醒石升星/升品的武将,没有则去需要使用到觉醒石的武将，没有需要用到觉醒石的武将则优先前往最先可升星的武将\r\n" + "comment": "优先前往可升星武将 , 有传将魂id则优先去这个将魂对应的武将，如果没有该武将则去这个武将的合成，如果不足够合成则弹出将魂的获取途径；不传将魂则优先前往最先可升星的武将；\n有传觉醒石，则优先去可用觉醒石升星/升品的武将,没有则去需要使用到觉醒石的武将，没有需要用到觉醒石的武将则优先前往最先可升星的武将\n" }, { "id": 134, @@ -1343,10 +1343,109 @@ { "id": 150, "type": 150, - "typeName": "TOWER_COLLECT", + "typeName": "TOWER_SEARCH", "name": "镇念塔派遣页面", "description": "镇念塔派遣", "icon": "tiaozhan_zhennianta", "comment": 0 + }, + { + "id": 151, + "type": 152, + "typeName": "TO_SECRET_PROP_GET", + "name": "秘境主界面", + "description": "秘境", + "icon": "tiaozhan_mijing", + "comment": "151&物品id 显示关卡名，如怒狼洞穴1\n若该道具有可扫荡的关卡，则跳转至可扫荡的最新关卡；若无可扫荡的关卡，则跳转至有该道具的可挑战的最新关卡；若既没有可扫荡，且挑战关卡未解锁，则按钮置灰显示未解锁，点击后提示解锁条件" + }, + { + "id": 152, + "type": 152, + "typeName": "WEEK_LIMIT_RECHARGE", + "name": "充值——每周限购", + "description": "每周限购", + "icon": "huodong_chongzhi", + "comment": 0 + }, + { + "id": 153, + "type": 153, + "typeName": "MAIN_LINE_WINDOW", + "name": "主线界面", + "description": "主线", + "icon": "zhuxian", + "comment": 0 + }, + { + "id": 154, + "type": 154, + "typeName": "DAY_NIGHT_GIFT_ACTIVITY", + "name": "朝夕拾遗", + "description": "朝夕拾遗", + "icon": "huodongzi_zxsy", + "comment": 0 + }, + { + "id": 155, + "type": 155, + "typeName": "RANK_TIME_LIMIT", + "name": "限时排行", + "description": "限时排行", + "icon": "biaoqian_xianshipaihang", + "comment": 0 + }, + { + "id": 156, + "type": 156, + "typeName": "PVP_HONOUR_ROAD", + "name": "PVP荣耀之路", + "description": "巅峰之路", + "icon": "juntuan_jingji", + "comment": 0 + }, + { + "id": 157, + "type": 157, + "typeName": "GUILD_ACTIVITY_MAIN", + "name": "军团活动总界面", + "description": "军团活动", + "icon": "juntuan", + "comment": 0 + }, + { + "id": 158, + "type": 158, + "typeName": "ACTIVITY_LUCKY_TURNTABLE", + "name": "幸运转盘", + "description": "幸运转盘", + "icon": "huodong_xingyunzhuanpan", + "comment": 0 + }, + { + "id": 159, + "type": 159, + "typeName": "PVP_LADDER", + "name": "名将擂台", + "description": "名将擂台", + "icon": "zhujiem_jingji1", + "comment": 0 + }, + { + "id": 160, + "type": 160, + "typeName": "PVP_LIST", + "name": "竞技初始界面", + "description": "竞技", + "icon": "juntuan_jingji", + "comment": 0 + }, + { + "id": 161, + "type": 161, + "typeName": "NEW_HEROS_RECRUIT", + "name": "五百抽", + "description": "五百抽", + "icon": "xinijiangyunji", + "comment": 0 } ] \ No newline at end of file