diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 875ea9e9f..74b455634 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -880,8 +880,8 @@ "HideAlienSpace": 0, "ShowBuff": 0, "RuleTips": { - "key": "", - "text": "" + "key": "battleready_battleready_RuleTips_1", + "text": "只能上阵真诚属性的守护者" }, "battleEvents": [], "ScoreGroupID": 0, @@ -911,8 +911,8 @@ "HideAlienSpace": 0, "ShowBuff": 0, "RuleTips": { - "key": "", - "text": "" + "key": "battleready_battleready_RuleTips_2", + "text": "只能上阵直觉属性的守护者" }, "battleEvents": [], "ScoreGroupID": 0, @@ -942,8 +942,8 @@ "HideAlienSpace": 0, "ShowBuff": 0, "RuleTips": { - "key": "", - "text": "" + "key": "battleready_battleready_RuleTips_3", + "text": "只能上阵共情属性的守护者" }, "battleEvents": [], "ScoreGroupID": 0, diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index efa0d35b4..c7b67d5e5 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -26060,7 +26060,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -160, "value": 10, "filter": [], "filter2": [] @@ -26082,7 +26082,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -160, "value": 20, "filter": [], "filter2": [] @@ -26362,7 +26362,7 @@ "t": "gold", "n": 2 }, - "NPC": 0, + "NPC": -160, "value": 100, "filter": [], "filter2": [] @@ -26386,7 +26386,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -11006, "value": 100000, "filter": [], "filter2": [] @@ -26410,7 +26410,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -165, "value": 100, "filter": [], "filter2": [] @@ -26434,7 +26434,7 @@ "t": "gold", "n": 2 }, - "NPC": 0, + "NPC": -160, "value": 30, "filter": [], "filter2": [] @@ -26458,7 +26458,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -160, "value": 1, "filter": [], "filter2": [] @@ -26482,7 +26482,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -10036, "value": 1, "filter": [], "filter2": [] @@ -26506,7 +26506,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -103, "value": 3, "filter": [], "filter2": [] @@ -26530,7 +26530,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -102, "value": 3, "filter": [], "filter2": [] @@ -26554,7 +26554,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -11006, "value": 300000, "filter": [], "filter2": [] @@ -26578,7 +26578,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -165, "value": 300, "filter": [], "filter2": [] @@ -26602,7 +26602,7 @@ "t": "gold", "n": 2 }, - "NPC": 0, + "NPC": -160, "value": 100, "filter": [], "filter2": [] @@ -26626,7 +26626,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -160, "value": 3, "filter": [], "filter2": [] @@ -26650,7 +26650,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -10036, "value": 3, "filter": [], "filter2": [] @@ -26674,7 +26674,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -103, "value": 10, "filter": [], "filter2": [] @@ -26698,7 +26698,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -102, "value": 10, "filter": [], "filter2": [] @@ -26722,7 +26722,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -11006, "value": 2000000, "filter": [], "filter2": [] @@ -26746,7 +26746,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -165, "value": 1000, "filter": [], "filter2": [] @@ -26770,7 +26770,7 @@ "t": "gold", "n": 2 }, - "NPC": 0, + "NPC": -160, "value": 300, "filter": [], "filter2": [] @@ -26794,7 +26794,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -160, "value": 10, "filter": [], "filter2": [] @@ -26818,7 +26818,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -10036, "value": 10, "filter": [], "filter2": [] @@ -26842,7 +26842,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -103, "value": 20, "filter": [], "filter2": [] @@ -26866,7 +26866,7 @@ "t": "gold", "n": 1 }, - "NPC": 0, + "NPC": -102, "value": 0, "filter": [], "filter2": [] diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 6308db1ee..61335d960 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -17,9 +17,9 @@ "model": "", "point": "", "stime": 20, - "etime": 20, + "etime": 80, "hp": 7, - "moderate": 100, + "moderate": 10, "sprint": 200, "acceleration": 100, "deceleration": 100 @@ -42,9 +42,9 @@ "model": "", "point": "", "stime": 20, - "etime": 20, - "hp": 5, - "moderate": 100, + "etime": 80, + "hp": 7, + "moderate": 10, "sprint": 200, "acceleration": 100, "deceleration": 100 @@ -67,9 +67,9 @@ "model": "", "point": "", "stime": 20, - "etime": 20, - "hp": 5, - "moderate": 100, + "etime": 80, + "hp": 7, + "moderate": 10, "sprint": 200, "acceleration": 100, "deceleration": 100 diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index 2698ac815..ef79d586d 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -1,7 +1,7 @@ [ { "id": 1, - "model": "NPC/kungfu/kungfu_51004", + "model": "NPC/kungfu/kungfu_51004.prefab", "idleAni": "kungfu_pavilion_action_1_act", "weight": 1000, "startstory": 400010, @@ -45,7 +45,7 @@ }, { "id": 2, - "model": "NPC/kungfu/kungfu_51005", + "model": "NPC/kungfu/kungfu_51005.prefab", "idleAni": "kungfu_pavilion_action_2_act", "weight": 1000, "startstory": 400030, diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index e1e5f5994..9d5072883 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -65,7 +65,7 @@ }, "skillintr": { "key": "equip_equip_suit_skillintr_3", - "text": "受到伤害时，有25%的概率【冰冻】目标1回合" + "text": "受到伤害时，有25%的概率[color=#f2bb496]【冰冻】[/color]目标1回合" }, "SetBonuses": [] }, @@ -155,7 +155,7 @@ }, "skillintr": { "key": "equip_equip_suit_skillintr_7", - "text": "造成伤害时，有20%概率【眩晕】目标1回合" + "text": "造成伤害时，有20%概率[color=#f2bb496]【眩晕】[/color]目标1回合" }, "SetBonuses": [] }, @@ -315,7 +315,7 @@ }, "skillintr": { "key": "equip_equip_suit_skillintr_15", - "text": "己方全体在战斗开始的时候获得2回合【护盾】（数值为最大生命值的15%）" + "text": "己方全体在战斗开始的时候获得2回合[color=#f2bb496]【护盾】[/color]（数值为最大生命值的15%）" }, "SetBonuses": [] }, @@ -405,7 +405,7 @@ }, "skillintr": { "key": "equip_equip_suit_skillintr_19", - "text": "战斗开始时获得1回合【免疫】" + "text": "战斗开始时获得1回合[color=#f2bb496]【免疫】[/color]" }, "SetBonuses": [] } diff --git a/bin/json/game_global.json b/bin/json/game_global.json index dde1e11d1..1b4adfaa6 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -229,8 +229,8 @@ "guild_DissolutionCountDown_cd": 1, "guild_dissolution_cd": 1, "guild_BuildCd": 1, - "ArenaTicket_max": 10, - "ArenaTicket_RecoveryTime": 144, + "ArenaTicket_max": 20, + "ArenaTicket_RecoveryTime": 120, "ArenaTicket_cos": { "a": "item", "t": "18000004", diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 0b6928ff2..013598f44 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -48,5 +48,15 @@ "n": 120 } ] + }, + { + "index": "358", + "var": [ + { + "a": "item", + "t": "18000004", + "n": 10 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 630d3bb0b..aa467c934 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -69,7 +69,7 @@ "Episodetype": 1, "openlevel": 1, "EditorStage": 0, - "venturemodel": "Person/badcar/badcar.prefab", + "venturemodel": "", "bubbletalk": { "key": "", "text": "" diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index b9ddff147..287c9293a 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -135465,7 +135465,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -135765,7 +135765,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -136065,7 +136065,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -136365,7 +136365,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -136665,7 +136665,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -136965,7 +136965,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -137265,7 +137265,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -137565,7 +137565,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -137865,7 +137865,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -138165,7 +138165,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -138465,7 +138465,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -138765,7 +138765,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55003, + "heroid": 55004, "star": 5, "equip": [], "newskill": [], @@ -139065,7 +139065,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -139365,7 +139365,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -139665,7 +139665,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -139965,7 +139965,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -140265,7 +140265,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -140565,7 +140565,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -140865,7 +140865,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -141165,7 +141165,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -141465,7 +141465,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -141765,7 +141765,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -142065,7 +142065,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], @@ -142365,7 +142365,7 @@ "captainId": 1, "IsBoss": 1, "bossHpCnt": 4, - "heroid": 55004, + "heroid": 55003, "star": 5, "equip": [], "newskill": [], diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 5ddb217c9..e0422949e 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -384,6 +384,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100404 } ], "wkqbx": 0, @@ -636,6 +640,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100608 } ], "wkqbx": 2, @@ -682,6 +690,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100404 } ], "wkqbx": 0, @@ -865,6 +877,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100304 } ], "wkqbx": 0, @@ -888,6 +904,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100508 } ], "wkqbx": 0, @@ -1500,7 +1520,16 @@ "key": "opencond_opencond_name_66", "text": "炼金塔" }, - "main": [], + "main": [ + { + "key": 1, + "param": 1 + }, + { + "key": 2, + "param": 1100308 + } + ], "wkqbx": 1, "kqbx": 0, "img": "", @@ -1743,6 +1772,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100604 } ], "wkqbx": 0, @@ -1793,6 +1826,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100504 } ], "wkqbx": 0, @@ -1888,6 +1925,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1101208 } ], "wkqbx": 0, @@ -1907,7 +1948,12 @@ "key": "opencond_opencond_name_83", "text": "无极塔" }, - "main": [], + "main": [ + { + "key": 2, + "param": 1101008 + } + ], "wkqbx": 0, "kqbx": 0, "img": "", @@ -1952,6 +1998,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100408 } ], "wkqbx": 2, diff --git a/bin/json/game_passcheck.json b/bin/json/game_passcheck.json index ed6fd33e2..6f93c2e74 100644 --- a/bin/json/game_passcheck.json +++ b/bin/json/game_passcheck.json @@ -227,11 +227,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -253,11 +248,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -279,11 +269,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -305,11 +290,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -331,11 +311,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -357,11 +332,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -383,11 +353,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -409,11 +374,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -435,11 +395,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -461,11 +416,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -487,11 +437,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -513,11 +458,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -539,11 +479,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -565,11 +500,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -591,11 +521,6 @@ "a": "item", "t": "10000001", "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -617,11 +542,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -643,11 +563,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -669,11 +584,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -695,11 +605,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -721,11 +626,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -747,11 +647,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -773,11 +668,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -799,11 +689,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -825,11 +710,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -851,11 +731,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -877,11 +752,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -903,11 +773,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -929,11 +794,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -955,11 +815,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -981,11 +836,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1007,11 +857,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1033,11 +878,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1059,11 +899,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1085,11 +920,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1111,11 +941,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1137,11 +962,6 @@ "a": "item", "t": "10000001", "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1163,11 +983,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1189,11 +1004,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1215,11 +1025,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1241,11 +1046,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1267,11 +1067,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1293,11 +1088,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1319,11 +1109,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1345,11 +1130,6 @@ "a": "item", "t": "10000001", "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1371,11 +1151,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1397,11 +1172,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1423,11 +1193,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1449,11 +1214,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1475,11 +1235,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1501,11 +1256,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1527,11 +1277,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1553,11 +1298,6 @@ "a": "item", "t": "10000001", "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1579,11 +1319,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1605,11 +1340,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1631,11 +1361,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1657,11 +1382,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1683,11 +1403,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1709,11 +1424,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1735,11 +1445,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1761,11 +1466,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1787,11 +1487,6 @@ "a": "item", "t": "10000001", "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1813,11 +1508,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1839,11 +1529,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1865,11 +1550,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1891,11 +1571,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1917,11 +1592,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] }, @@ -1943,11 +1613,6 @@ "a": "item", "t": "10000001", "n": 5 - }, - { - "a": "attr", - "t": "diamond", - "n": 50 } ] } diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index fbde38f46..d508b6089 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -84,7 +84,7 @@ }, "content": { "key": "ruledesc_ruledesc_content_8", - "text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战卷。
竞技场挑战卷随时间恢复，每144分钟回复一张。
可以使用月光原石直接购买竞技场挑战卷。购买上限最多为8张。每次购买消耗的月光原石逐级递增。
挑战玩家也需消耗竞技场挑战卷，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。
积分排名逻辑：
黑铁：0—799，竞技胜利获胜奖励为竞技币10个。
青铜：800-1299，竞技胜利获胜奖励为竞技币12个。
白银：1300-1599，竞技胜利获胜奖励为竞技币14个。
黄金：1600-2199，竞技胜利获胜奖励为竞技币16个。
铂金：2200-2799，竞技胜利获胜奖励为竞技币18个。
月光原石:2800-3699,竞技胜利获胜奖励为竞技币20个。
大师：3700-4599，竞技胜利获胜奖励为竞技币22个。
王者：4600以上，竞技胜利获胜奖励为竞技币22个。
积分排名奖励具体查看排名中的奖励预览。" + "text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。
挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战券。
竞技场挑战券随时间恢复，每144分钟回复一张。
可以使用月光原石直接购买竞技场挑战券。购买上限最多为8张。每次购买消耗的月光原石逐级递增。
挑战玩家也需消耗竞技场挑战券，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。
积分排名逻辑：
黑铁：0—799，竞技胜利获胜奖励为竞技币10个。
青铜：800-1299，竞技胜利获胜奖励为竞技币12个。
白银：1300-1599，竞技胜利获胜奖励为竞技币14个。
黄金：1600-2199，竞技胜利获胜奖励为竞技币16个。
铂金：2200-2799，竞技胜利获胜奖励为竞技币18个。
月光原石:2800-3699,竞技胜利获胜奖励为竞技币20个。
大师：3700-4599，竞技胜利获胜奖励为竞技币22个。
王者：4600以上，竞技胜利获胜奖励为竞技币22个。
积分排名奖励具体查看排名中的奖励预览。" } }, { @@ -194,7 +194,7 @@ }, "content": { "key": "ruledesc_ruledesc_content_18", - "text": "圣桃招募
这里可以使用圣桃枝招募新的守护者们。
（圣桃枝可以用200月光原石购买一个）
招募概率公示：
史诗守护者获得概率：1.2%
完美守护者获得概率：10.8%
稀有守护者获得概率：88%
限定招募
这里可以选择自己喜欢的守护者，招募到一定次数后必出该守护者。
限定招募都有时间限制，时间结束后保底重置。
阵营招募
阵营招募可以使用特定的圣桃枝去招募特定阵容的守护者。
许愿招募
当玩家进行圣桃招募时，获得四星守护者可以获得一个圣桃。
获得五星守护者时能获得三十个圣桃。
消耗100个圣桃可以选择一个五星守护者固定招募出来。" + "text": "【圣桃招募】
这里可以使用圣桃枝招募新的守护者们。
（圣桃枝可以用200月光原石购买一个）
招募概率公示：
史诗守护者获得概率：1.2%
完美守护者获得概率：10.8%
稀有守护者获得概率：88%
【限定招募】
这里可以选择自己喜欢的守护者，招募到一定次数后必出该守护者。
限定招募都有时间限制，时间结束后保底重置。
【阵营招募】
阵营招募可以使用特定的圣桃枝去招募特定阵容的守护者。
【许愿招募】
当玩家进行圣桃招募时，获得四星守护者可以获得一个圣桃。
获得五星守护者时能获得三十个圣桃。
消耗圣桃可以选择一个五星守护者固定招募出来。每个守护者需要的圣桃数量不同。" } }, { diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 75ed14b44..a37fb5867 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -10,11 +10,10 @@ "difficulty": 1, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -70,11 +69,10 @@ "difficulty": 2, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -125,11 +123,10 @@ "difficulty": 3, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -185,11 +182,10 @@ "difficulty": 4, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -240,11 +236,10 @@ "difficulty": 5, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -300,11 +295,10 @@ "difficulty": 6, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -360,11 +354,10 @@ "difficulty": 7, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -425,11 +418,10 @@ "difficulty": 8, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -485,11 +477,10 @@ "difficulty": 9, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -550,11 +541,10 @@ "difficulty": 10, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -615,11 +605,10 @@ "difficulty": 11, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -680,11 +669,10 @@ "difficulty": 12, "BattleReadyID": 134, "captionrecommend": [ - 45003, - 44006, - 24002, - 15005, - 45001 + 25001, + 25004, + 35005, + 25003 ], "firstprize": [ { @@ -740,11 +728,10 @@ "difficulty": 1, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -800,11 +787,10 @@ "difficulty": 2, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -855,11 +841,10 @@ "difficulty": 3, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -915,11 +900,10 @@ "difficulty": 4, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -970,11 +954,10 @@ "difficulty": 5, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1030,11 +1013,10 @@ "difficulty": 6, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1090,11 +1072,10 @@ "difficulty": 7, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1155,11 +1136,10 @@ "difficulty": 8, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1215,11 +1195,10 @@ "difficulty": 9, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1280,11 +1259,10 @@ "difficulty": 10, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1345,11 +1323,10 @@ "difficulty": 11, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1410,11 +1387,10 @@ "difficulty": 12, "BattleReadyID": 133, "captionrecommend": [ - 45003, - 25004, - 14005, - 34003, - 24001 + 14007, + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1470,11 +1446,9 @@ "difficulty": 1, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1530,11 +1504,9 @@ "difficulty": 2, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1585,11 +1557,9 @@ "difficulty": 3, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1645,11 +1615,9 @@ "difficulty": 4, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1700,11 +1668,9 @@ "difficulty": 5, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1760,11 +1726,9 @@ "difficulty": 6, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1820,11 +1784,9 @@ "difficulty": 7, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1885,11 +1847,9 @@ "difficulty": 8, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -1945,11 +1905,9 @@ "difficulty": 9, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -2010,11 +1968,9 @@ "difficulty": 10, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -2075,11 +2031,9 @@ "difficulty": 11, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { @@ -2140,11 +2094,9 @@ "difficulty": 12, "BattleReadyID": 121, "captionrecommend": [ - 45003, - 15005, - 44006, - 14005, - 24003 + 25003, + 34006, + 15003 ], "firstprize": [ { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 74ee5b98c..b831a9f23 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -1477,6 +1477,26 @@ "a": "attr", "t": "gold", "n": 8200 + }, + { + "a": "item", + "t": "15000101", + "n": 30 + }, + { + "a": "item", + "t": "15000102", + "n": 30 + }, + { + "a": "item", + "t": "15000103", + "n": 30 + }, + { + "a": "item", + "t": "15000104", + "n": 30 } ], "module": [] @@ -5712,7 +5732,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 100020, + "id_after": 0, "group": 1010, "exgroup": 110, "des": 1, @@ -5759,59 +5779,6 @@ ], "module": [] }, - { - "key": 100020, - "opencond": "", - "lock": 1, - "lockend": 999, - "ontxe": 100010, - "id_after": 0, - "group": 1010, - "exgroup": 110, - "des": 1, - "icon": "25001", - "task_name": { - "key": "worldtask_world_task_task_name_139", - "text": "梅林的试炼" - }, - "task_details": { - "key": "worldtask_world_task_task_details_139", - "text": "梅林的试炼" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_139", - "text": "梅林的试炼" - }, - "get_item": [], - "trigger": 0, - "npc": 60020, - "completetask": [ - 50000012 - ], - "deliver_npc": 60028, - "taskend_removeitem": [], - "auto_accept": 0, - "tasktips": 1, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 3000 - }, - { - "a": "attr", - "t": "ps", - "n": 10 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ], - "module": [] - }, { "key": 100030, "opencond": "", @@ -6636,7 +6603,7 @@ "completetask": [ 50000028 ], - "deliver_npc": 60188, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 1, @@ -6689,7 +6656,7 @@ "completetask": [ 50000029 ], - "deliver_npc": 60198, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 1, @@ -6742,7 +6709,7 @@ "completetask": [ 50000030 ], - "deliver_npc": 60208, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 1, @@ -6795,7 +6762,7 @@ "completetask": [ 50000031 ], - "deliver_npc": 60218, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 1, @@ -6848,7 +6815,7 @@ "completetask": [ 50000032 ], - "deliver_npc": 60228, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 1, diff --git a/modules/robot/modulerobot_equipment.go b/modules/robot/modulerobot_equipment.go index cd522e481..41ee69588 100644 --- a/modules/robot/modulerobot_equipment.go +++ b/modules/robot/modulerobot_equipment.go @@ -144,11 +144,16 @@ func (this *ModuleRobot_Equipment) DoTask(robot IRobot, taskconf *cfg.GameWorldT return } break + case comm.Rtype43, comm.Rtype92, comm.Rtype96: //强化 var ( equipment *pb.DB_Equipment + lv int32 = 15 ) - if equipment, err = this.findcanupgrade(); err != nil { + if comm.TaskType(condconf.Type) == comm.Rtype43 { + lv = condconf.Filter[0] + } + if equipment, err = this.findcanupgrade(lv); err != nil { return } if _, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "equipment", "upgrade", &pb.EquipmentUpgradeReq{ @@ -276,7 +281,7 @@ func (this *ModuleRobot_Equipment) findcanEquipEquipment(hero *pb.DBHero, minsta } //查询能强化的装备 -func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment, err error) { +func (this *ModuleRobot_Equipment) findcanupgrade(lv int32) (equipment *pb.DB_Equipment, err error) { var ( equipments []*pb.DB_Equipment = make([]*pb.DB_Equipment, 0, len(this.equipments)) conf *cfg.GameEquipData @@ -284,7 +289,9 @@ func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment, ) var () for _, v := range this.equipments { - equipments = append(equipments, v) + if v.Lv < lv { + equipments = append(equipments, v) + } } sort.Slice(equipments, func(i, j int) bool { return equipments[i].Lv > equipments[j].Lv @@ -293,7 +300,7 @@ func (this *ModuleRobot_Equipment) findcanupgrade() (equipment *pb.DB_Equipment, if conf, err = this.getGameEquipData(equipment.CId); err != nil { return } - if upconf, err = this.getEquipmentMaxIntensifyConfigure(conf.EquipId, conf.Color); err == nil && upconf.Level > equipment.Lv { + if upconf, err = this.getEquipmentMaxIntensifyConfigure(conf.EquipId, conf.Color); err == nil && upconf.Level >= equipment.Lv { return } } diff --git a/modules/robot/modulerobot_sys.go b/modules/robot/modulerobot_sys.go index c9cb8fdbd..9fb6ac75d 100644 --- a/modules/robot/modulerobot_sys.go +++ b/modules/robot/modulerobot_sys.go @@ -27,6 +27,10 @@ func (this *ModuleRobot_Sys) Receive(robot IRobot, stype string, message proto.M resp := message.(*pb.SysFuncGetListResp) this.cmd = resp.Cond break + case "funcactivate": + resp := message.(*pb.SysFuncActivateResp) + this.cmd[resp.Cid] = 2 + break } return } diff --git a/modules/robot/robotmgrcomp.go b/modules/robot/robotmgrcomp.go index 5ffedf7ef..c9402dfdb 100644 --- a/modules/robot/robotmgrcomp.go +++ b/modules/robot/robotmgrcomp.go @@ -58,7 +58,7 @@ func (this *robotmgrComp) createRobot(index int32) { ) robot = &Robot{ index: index, - account: fmt.Sprintf("ft_%d", index), + account: fmt.Sprintf("it_%d", index), serverId: this.module.options.ServerID, pipeline: this.module.options.Pipeline, }