diff --git a/shared/resource/jsons/dic_army_activeDayReward.json b/shared/resource/jsons/dic_army_activeDayReward.json index 5860ccc04..7405f26c0 100755 --- a/shared/resource/jsons/dic_army_activeDayReward.json +++ b/shared/resource/jsons/dic_army_activeDayReward.json @@ -7,16 +7,16 @@ { "id": 2, "activeDayPoint": 2000, - "Reward": "31002&500" + "Reward": "17052&20" }, { "id": 3, "activeDayPoint": 3000, - "Reward": "40005&3000" + "Reward": "17053&2" }, { "id": 4, "activeDayPoint": 4000, - "Reward": "31002&1000" + "Reward": "40005&2000" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_army_authority.json b/shared/resource/jsons/dic_army_authority.json index 877f70898..90d34d1ce 100644 --- a/shared/resource/jsons/dic_army_authority.json +++ b/shared/resource/jsons/dic_army_authority.json @@ -148,55 +148,5 @@ "id": 30, "name": "查看军团活跃榜", "authority": "1&2&3&4" - }, - { - "id": 31, - "name": "演舞台挑战", - "authority": "1&2&3" - }, - { - "id": 32, - "name": "捐献所操作", - "authority": "1&2&3" - }, - { - "id": 33, - "name": "炼器", - "authority": "1&2&3" - }, - { - "id": 34, - "name": "助力科技树研发", - "authority": "1&2&3" - }, - { - "id": 35, - "name": "练兵场训练", - "authority": "1&2&3" - }, - { - "id": 36, - "name": "许愿池操作", - "authority": "1&2&3" - }, - { - "id": 37, - "name": "蛮夷入侵挑战", - "authority": "1&2&3" - }, - { - "id": 38, - "name": "诸侯混战宣战", - "authority": "1" - }, - { - "id": 39, - "name": "诸侯混战挑战", - "authority": "1&2&3" - }, - { - "id": 40, - "name": "粮草先行活动", - "authority": "1&2&3" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json index cc793b4b9..964fe685d 100755 --- a/shared/resource/jsons/dic_army_bossBase.json +++ b/shared/resource/jsons/dic_army_bossBase.json @@ -17,7 +17,7 @@ "level": 2, "bossLevel": 25, "warIdHP": "8001&2000000|8002&2000000|8003&2000000|8004&2000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 6000, "buildWords": "&", "opencost": 1000, @@ -29,7 +29,7 @@ "level": 3, "bossLevel": 30, "warIdHP": "8001&3000000|8002&3000000|8003&3000000|8004&3000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 7000, "buildWords": "&", "opencost": 1000, @@ -41,7 +41,7 @@ "level": 4, "bossLevel": 40, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 8000, "buildWords": "&", "opencost": 1000, @@ -53,7 +53,7 @@ "level": 5, "bossLevel": 50, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 9000, "buildWords": "&", "opencost": 1000, @@ -65,7 +65,7 @@ "level": 6, "bossLevel": 60, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 10000, "buildWords": "&", "opencost": 1000, @@ -77,7 +77,7 @@ "level": 7, "bossLevel": 70, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 11000, "buildWords": "&", "opencost": 1000, @@ -89,7 +89,7 @@ "level": 8, "bossLevel": 80, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 12000, "buildWords": "&", "opencost": 1000, @@ -101,7 +101,7 @@ "level": 9, "bossLevel": 90, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 13000, "buildWords": "&", "opencost": 1000, @@ -113,7 +113,7 @@ "level": 10, "bossLevel": 100, "warIdHP": "8001&4000000|8002&4000000|8003&4000000|8004&4000000", - "reward": "20001&60&1|21008&40&1|42008&20&2|42115&20&3", + "reward": "21001&60&1|21008&40&1|42008&20&2|42115&20&3", "consume": 15000, "buildWords": "&", "opencost": 1000, diff --git a/shared/resource/jsons/dic_army_developmentConsume.json b/shared/resource/jsons/dic_army_developmentConsume.json index 3d53a6b4d..07ddfed55 100755 --- a/shared/resource/jsons/dic_army_developmentConsume.json +++ b/shared/resource/jsons/dic_army_developmentConsume.json @@ -2,240 +2,264 @@ { "id": 1, "quality": 1, + "starLevel": 1, "levelMin": 1, - "levelMax": 19, + "levelMax": 20, "preposition": "&", - "honourConsume": "40005&2000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 2, "quality": 2, + "starLevel": 1, "levelMin": 1, - "levelMax": 19, + "levelMax": 20, "preposition": "1&", - "honourConsume": "40005&3000", + "honourConsume": "40005&150", "fundConsume": 500, "timeConsume": 16200 }, { "id": 3, "quality": 3, + "starLevel": 1, "levelMin": 1, - "levelMax": 19, + "levelMax": 20, "preposition": "1&", - "honourConsume": "40005&6000", + "honourConsume": "40005&450", "fundConsume": 1000, "timeConsume": 31800 }, { "id": 4, "quality": 4, + "starLevel": 1, "levelMin": 1, - "levelMax": 19, + "levelMax": 20, "preposition": "1&", - "honourConsume": "40005&13500", + "honourConsume": "40005&1350", "fundConsume": 2000, "timeConsume": 72000 }, { "id": 5, "quality": 1, - "levelMin": 20, - "levelMax": 39, + "starLevel": 2, + "levelMin": 21, + "levelMax": 40, "preposition": "&", - "honourConsume": "40005&3000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 6, "quality": 2, - "levelMin": 20, - "levelMax": 39, + "starLevel": 2, + "levelMin": 21, + "levelMax": 40, "preposition": "5&2", - "honourConsume": "40005&4500", + "honourConsume": "40005&150", "fundConsume": 1000, "timeConsume": 16200 }, { "id": 7, "quality": 3, - "levelMin": 20, - "levelMax": 39, + "starLevel": 2, + "levelMin": 21, + "levelMax": 40, "preposition": "5&3", - "honourConsume": "40005&9000", + "honourConsume": "40005&450", "fundConsume": 2000, "timeConsume": 31800 }, { "id": 8, "quality": 4, - "levelMin": 20, - "levelMax": 39, + "starLevel": 2, + "levelMin": 21, + "levelMax": 40, "preposition": "5&4", - "honourConsume": "40005&20250", + "honourConsume": "40005&1350", "fundConsume": 4000, "timeConsume": 72000 }, { "id": 9, "quality": 1, - "levelMin": 40, - "levelMax": 59, + "starLevel": 3, + "levelMin": 41, + "levelMax": 60, "preposition": "&", - "honourConsume": "40005&4000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 10, "quality": 2, - "levelMin": 40, - "levelMax": 59, + "starLevel": 3, + "levelMin": 41, + "levelMax": 60, "preposition": "9&6", - "honourConsume": "40005&6000", + "honourConsume": "40005&150", "fundConsume": 1500, "timeConsume": 16200 }, { "id": 11, "quality": 3, - "levelMin": 40, - "levelMax": 59, + "starLevel": 3, + "levelMin": 41, + "levelMax": 60, "preposition": "9&7", - "honourConsume": "40005&12000", + "honourConsume": "40005&450", "fundConsume": 3000, "timeConsume": 31800 }, { "id": 12, "quality": 4, - "levelMin": 40, - "levelMax": 59, + "starLevel": 3, + "levelMin": 41, + "levelMax": 60, "preposition": "9&8", - "honourConsume": "40005&27000", + "honourConsume": "40005&1350", "fundConsume": 6000, "timeConsume": 72000 }, { "id": 13, "quality": 1, - "levelMin": 60, - "levelMax": 79, + "starLevel": 4, + "levelMin": 61, + "levelMax": 80, "preposition": "&", - "honourConsume": "40005&5000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 14, "quality": 2, - "levelMin": 60, - "levelMax": 79, + "starLevel": 4, + "levelMin": 61, + "levelMax": 80, "preposition": "13&10", - "honourConsume": "40005&7500", + "honourConsume": "40005&150", "fundConsume": 2000, "timeConsume": 16200 }, { "id": 15, "quality": 3, - "levelMin": 60, - "levelMax": 79, + "starLevel": 4, + "levelMin": 61, + "levelMax": 80, "preposition": "13&11", - "honourConsume": "40005&15000", + "honourConsume": "40005&450", "fundConsume": 4000, "timeConsume": 31800 }, { "id": 16, "quality": 4, - "levelMin": 60, - "levelMax": 79, + "starLevel": 4, + "levelMin": 61, + "levelMax": 80, "preposition": "13&12", - "honourConsume": "40005&33750", + "honourConsume": "40005&1350", "fundConsume": 8000, "timeConsume": 72000 }, { "id": 17, "quality": 1, - "levelMin": 80, + "starLevel": 5, + "levelMin": 81, "levelMax": 99, "preposition": "&", - "honourConsume": "40005&6000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 18, "quality": 2, - "levelMin": 80, + "starLevel": 5, + "levelMin": 81, "levelMax": 99, "preposition": "17&14", - "honourConsume": "40005&9000", + "honourConsume": "40005&150", "fundConsume": 2500, "timeConsume": 16200 }, { "id": 19, "quality": 3, - "levelMin": 80, + "starLevel": 5, + "levelMin": 81, "levelMax": 99, "preposition": "17&15", - "honourConsume": "40005&18000", + "honourConsume": "40005&450", "fundConsume": 5000, "timeConsume": 31800 }, { "id": 20, "quality": 4, - "levelMin": 80, + "starLevel": 5, + "levelMin": 81, "levelMax": 99, "preposition": "17&16", - "honourConsume": "40005&40500", + "honourConsume": "40005&1350", "fundConsume": 10000, "timeConsume": 72000 }, { "id": 21, "quality": 1, + "starLevel": 6, "levelMin": 100, "levelMax": 100, "preposition": "&", - "honourConsume": "40005&7000", + "honourConsume": "40005&50", "fundConsume": 0, "timeConsume": 0 }, { "id": 22, "quality": 2, + "starLevel": 6, "levelMin": 100, "levelMax": 100, "preposition": "21&18", - "honourConsume": "40005&10500", + "honourConsume": "40005&150", "fundConsume": 3000, "timeConsume": 16200 }, { "id": 23, "quality": 3, + "starLevel": 6, "levelMin": 100, "levelMax": 100, "preposition": "21&19", - "honourConsume": "40005&21000", + "honourConsume": "40005&450", "fundConsume": 6000, "timeConsume": 31800 }, { "id": 24, "quality": 4, + "starLevel": 6, "levelMin": 100, "levelMax": 100, "preposition": "21&20", - "honourConsume": "40005&47250", + "honourConsume": "40005&1350", "fundConsume": 12000, "timeConsume": 72000 } diff --git a/shared/resource/jsons/dic_army_donateBase.json b/shared/resource/jsons/dic_army_donateBase.json index c75c07529..e8dd39b91 100755 --- a/shared/resource/jsons/dic_army_donateBase.json +++ b/shared/resource/jsons/dic_army_donateBase.json @@ -3,8 +3,8 @@ "id": 1, "structureId": 7, "level": 1, - "donatevalue": "1&31001&2000|2&31002&10|3&31002&20", - "honourReward": "40005&20|40005&100|40005&400", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "20&200&600", "consume": 5000, "buildWords": "&", @@ -16,8 +16,8 @@ "id": 2, "structureId": 7, "level": 2, - "donatevalue": "1&31001&4000|2&31002&20|3&31002&40", - "honourReward": "40005&40|40005&200|40005&600", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "40&400&1000", "consume": 6000, "buildWords": "&", @@ -29,8 +29,8 @@ "id": 3, "structureId": 7, "level": 3, - "donatevalue": "1&31001&6000|2&31002&30|3&31002&60", - "honourReward": "40005&60|40005&300|40005&800", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "60&600&1400", "consume": 7000, "buildWords": "&", @@ -42,8 +42,8 @@ "id": 4, "structureId": 7, "level": 4, - "donatevalue": "1&31001&8000|2&31002&40|2&31002&80", - "honourReward": "40005&80|40005&400|40005&1000", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "80&800&1800", "consume": 8000, "buildWords": "&", @@ -55,8 +55,8 @@ "id": 5, "structureId": 7, "level": 5, - "donatevalue": "1&31001&10000|2&31002&50|3&31002&100", - "honourReward": "40005&100|40005&500|40005&1200", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "100&1000&2200", "consume": 9000, "buildWords": "&", @@ -68,8 +68,8 @@ "id": 6, "structureId": 7, "level": 6, - "donatevalue": "1&31001&12000|2&31002&60|3&31002&120", - "honourReward": "40005&120|40005&600|40005&1400", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "120&1200&2600", "consume": 10000, "buildWords": "&", @@ -81,8 +81,8 @@ "id": 7, "structureId": 7, "level": 7, - "donatevalue": "1&31001&14000|2&31002&70|3&31002&140", - "honourReward": "40005&140|40005&700|40005&1600", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "140&1400&3000", "consume": 11000, "buildWords": "&", @@ -94,8 +94,8 @@ "id": 8, "structureId": 7, "level": 8, - "donatevalue": "1&31001&16000|2&31002&80|3&31002&160", - "honourReward": "40005&160|40005&800|40005&1800", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "160&1600&3400", "consume": 12000, "buildWords": "&", @@ -107,8 +107,8 @@ "id": 9, "structureId": 7, "level": 9, - "donatevalue": "1&31001&18000|2&31002&90|3&31002&180", - "honourReward": "40005&180|40005&900|40005&2000", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "180&1800&3800", "consume": 13000, "buildWords": "&", @@ -120,8 +120,8 @@ "id": 10, "structureId": 7, "level": 10, - "donatevalue": "1&31001&20000|2&31002&100|3&31002&200", - "honourReward": "40005&200|40005&1000|40005&2200", + "donatevalue": "1&31001&1000|2&31002&50|3&31002&100", + "honourReward": "40005&500|40005&1000|40005&2000", "fundReward": "200&2000&4200", "consume": 15000, "buildWords": "&", diff --git a/shared/resource/jsons/dic_army_donateBoxReward.json b/shared/resource/jsons/dic_army_donateBoxReward.json index 41d909fac..af3b6b756 100755 --- a/shared/resource/jsons/dic_army_donateBoxReward.json +++ b/shared/resource/jsons/dic_army_donateBoxReward.json @@ -1,22 +1,22 @@ [ { "id": 1, - "fund": 1000, - "boxReward": "31001&10000" + "fund": 100, + "boxReward": "40005&1000" }, { "id": 2, - "fund": 3000, - "boxReward": "40005&2000" + "fund": 200, + "boxReward": "17052&5" }, { "id": 3, - "fund": 5000, - "boxReward": "31002&200" + "fund": 300, + "boxReward": "17053&1" }, { "id": 4, - "fund": 7000, - "boxReward": "31002&500" + "fund": 400, + "boxReward": "40005&2000" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_army_structureOpen.json b/shared/resource/jsons/dic_army_structureOpen.json index c89f880d7..2cbf3fe09 100644 --- a/shared/resource/jsons/dic_army_structureOpen.json +++ b/shared/resource/jsons/dic_army_structureOpen.json @@ -4,48 +4,71 @@ "structureId": 1, "openLv": 1, "name": "中军大帐", - "info": "&" + "info": "&", + "playerLvLimit": 0 }, { "id": 2, "structureId": 2, "openLv": 2, "name": "炼器堂", - "info": "中军大帐2级时开启" + "info": "中军大帐2级时开启", + "playerLvLimit": 0 }, { "id": 3, "structureId": 3, "openLv": 2, "name": "演武台", - "info": "中军大帐2级时开启" + "info": "中军大帐2级时开启", + "playerLvLimit": 0 }, { "id": 4, "structureId": 4, "openLv": 2, "name": "练兵场", - "info": "中军大帐2级时开启" + "info": "中军大帐2级时开启", + "playerLvLimit": 0 }, { "id": 5, "structureId": 5, "openLv": 1, "name": "许愿池", - "info": "中军大帐1级时开启" + "info": "中军大帐1级时开启", + "playerLvLimit": 0 }, { "id": 6, "structureId": 6, "openLv": 1, "name": "商店", - "info": "中军大帐1级时开启" + "info": "中军大帐1级时开启", + "playerLvLimit": 0 }, { "id": 7, "structureId": 7, "openLv": 1, "name": "捐献所", - "info": "中军大帐1级时开启" + "info": "中军大帐1级时开启", + "playerLvLimit": 0 + }, + { + "id": 8, + "structureId": 8, + "openLv": 2, + "name": "军团活动", + "info": "中军大帐2级时开启", + "playerLvLimit": 25 + }, + { + "id": 9, + "structureId": 9, + "openLv": 2, + "name": "拍卖行", + "info": "中军大帐2级时开启", + "playerLvLimit": 0 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_army_trainSoloReward.json b/shared/resource/jsons/dic_army_trainSoloReward.json index 78719d199..1931b5df8 100755 --- a/shared/resource/jsons/dic_army_trainSoloReward.json +++ b/shared/resource/jsons/dic_army_trainSoloReward.json @@ -3,21 +3,21 @@ "id": 1, "name": "普通", "ratio": 1, - "winReward": "1&600|2&2000", + "winReward": "1&400|2&2000", "failReward": "1&200|2&200" }, { "id": 2, "name": "精英", "ratio": 1.2, - "winReward": "1&700|2&2400", - "failReward": "1&400|2&240" + "winReward": "1&500|2&2400", + "failReward": "1&300|2&240" }, { "id": 3, "name": "噩梦", "ratio": 1.4, - "winReward": "1&800|2&2700", - "failReward": "1&800|2&270" + "winReward": "1&600|2&2700", + "failReward": "1&500|2&270" } ] \ No newline at end of file