diff --git a/conf/BattleMain.lua b/conf/BattleMain.lua index 58097c205..9e9ec98a1 100644 --- a/conf/BattleMain.lua +++ b/conf/BattleMain.lua @@ -101,7 +101,7 @@ local function generateRecordFile() os.date("%H"), os.date("%M"), os.date("%S")) - local file = io.open("luafight/BattleRecord/"..time..".txt", "a") + local file = io.open("../luafight/BattleRecord/"..time..".txt", "a") local record = BattleLogic.GetRecord() for i=1, #record do file:write(record[i].."\n") @@ -114,7 +114,7 @@ function BattleMain.Execute(args, fightData, optionData) _optionData = optionData or {} --该开关用于输出战斗过程中的日志,用于验证前后端是否出现战斗不同步 - BattleLogic.IsOpenBattleRecord = false + BattleLogic.IsOpenBattleRecord = true local isError = false local errorCache @@ -178,7 +178,7 @@ function BattleMain.Execute(args, fightData, optionData) os.date("%H"), os.date("%M"), os.date("%S")) - local file = io.open("luafight/LogError/"..time..".txt", "a") + local file = io.open("../luafight/LogError/"..time..".txt", "a") file:write(errorCache) file:write("fightData:\n"..PrintTable(_fightData).."\n") file:write("optionData:\n"..PrintTable(_optionData).."\n") diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index 3db1ee4ac..56b3a3992 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -423,12 +423,12 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 64013 千钧短杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64027 千钧之刺 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64028 撼岳之刺 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -64041 千钧战矛 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -64042 撼岳战矛 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +64041 千钧战斧 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +64042 撼岳战斧 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64055 千钧之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64056 撼岳之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -64069 千钧秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -64070 撼岳秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +64069 千钧法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +64070 撼岳法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64073 光羽战甲 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 64079 妖王战甲 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 65018 无始神杖 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 @@ -439,16 +439,16 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 65058 无始神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65077 离恨古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65079 归凡古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -65097 离恨宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -65100 道衍宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +65097 离恨圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +65100 道衍圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65104 朱雀神甲 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65128 麒麟战盔 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65129 应龙战盔 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -52001 猎户大锤 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52002 兽骨匕首 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52003 坚固宝剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52004 家传短匕 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52005 游侠战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52001 猎户法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52002 兽骨法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52003 坚固法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52004 家传法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52005 游侠法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52006 戍卫法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52007 硬木法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52008 黑铁法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 @@ -464,12 +464,12 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 52018 轻灵法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52019 先知法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52020 杀戮法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52021 猎户叉 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52022 兽骨大锤 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52023 坚固匕首 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52024 家传宝剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52025 游侠短匕 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52026 戍卫战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52021 猎户短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52022 兽骨短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52023 坚固短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52024 家传短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52025 游侠短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52026 戍卫短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52027 硬木短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52028 黑铁短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52029 黄铜短剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 @@ -484,12 +484,12 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 52038 轻灵之刺 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52039 先知之刺 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52040 杀戮之刺 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52041 猎户叉 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52042 兽骨大锤 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52043 坚固匕首 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52044 家传宝剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52045 游侠短匕 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52046 戍卫战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52041 猎户大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52042 兽骨大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52043 坚固大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52044 家传大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52045 游侠大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52046 戍卫大斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52047 硬木斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52048 黑铁斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52049 黄铜斧 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 @@ -500,15 +500,15 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 52054 妖麟戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52055 飞羽戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52056 青烟戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52057 追光矛 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52058 轻灵矛 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52059 先知矛 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52060 杀戮矛 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52061 猎户叉 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52062 兽骨大锤 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52063 坚固匕首 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52064 家传宝剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52065 游侠短匕 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52057 追光戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52058 轻灵戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52059 先知戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52060 杀戮戟 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52061 猎户战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52062 兽骨战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52063 坚固战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52064 家传战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52065 游侠战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52066 戍卫战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52067 硬木短刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52068 黑铁短刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 @@ -524,26 +524,26 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 52078 轻灵长刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52079 先知长刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52080 杀戮长刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52081 猎户大锤 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52082 兽骨匕首 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52083 坚固宝剑 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52084 家传短匕 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52085 游侠战刀 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52086 戍卫法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52087 硬木法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52088 黑铁法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52089 黄铜法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52090 锻钢法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52091 赤金法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52092 灵玉法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52093 地龙法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52094 妖麟法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52095 飞羽法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52096 青烟法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52097 追光法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52098 轻灵法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52099 先知法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 -52100 杀戮法杖 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52081 猎户铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52082 兽骨铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52083 坚固铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52084 家传铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52085 游侠铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52086 戍卫铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52087 硬木铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52088 黑铁铜铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52089 黄铜法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52090 锻钢法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52091 赤金法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52092 灵玉法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52093 地龙法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52094 妖麟法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52095 飞羽法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52096 青烟法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52097 追光法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52098 轻灵法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52099 先知法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 +52100 杀戮法铃 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52101 猎户蓑衣 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52102 兽皮软甲 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 52103 坚固皮甲 false 3 1 2 0 1 15011 0 0 0 1 0 1 1 @@ -652,10 +652,10 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 53036 乘风大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53037 光羽大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53038 破空大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53039 逐光大矛 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53040 轻尘大矛 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53041 洞察大矛 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53042 屠戮大矛 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53039 逐光大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53040 轻尘大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53041 洞察大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53042 屠戮大戟 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53043 乌木短剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53044 陨铁短剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53045 寒铜短剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 @@ -670,20 +670,20 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 53054 轻尘长剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53055 洞察长剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53056 屠戮长剑 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53057 乌木法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53058 陨铁法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53059 寒铜法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53060 秘钢法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53061 玄金法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53062 墨玉法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53063 神行法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53064 乘风法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53065 光羽法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53066 破空法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53067 逐光法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53068 轻尘法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53069 洞察法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 -53070 屠戮法杖 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53057 乌木法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53058 陨铁法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53059 寒铜法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53060 秘钢法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53061 玄金法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53062 墨玉法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53063 神行法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53064 乘风法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53065 光羽法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53066 破空法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53067 逐光法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53068 轻尘法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53069 洞察法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 +53070 屠戮法铃 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53071 乌木战甲 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53072 陨铁战甲 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 53073 寒铜战甲 false 3 1 3 0 1 15012 0 0 0 1 0 1 1 @@ -773,8 +773,8 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 54036 踏江战戟 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54037 悬河战戟 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54038 镜湖战戟 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54039 止玄战矛 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54040 无锋战矛 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54039 止玄战戟 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54040 无锋战戟 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54043 御风之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54044 困雨之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54045 折雪之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 @@ -787,18 +787,18 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 54052 镜湖之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54053 止玄之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54054 无锋之刃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54057 御风法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54058 困雨法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54059 折雪法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54060 碎土法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54061 叠云法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54062 藏雷法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54063 残雾法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54064 踏江法杖 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54065 悬河秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54066 镜湖秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54067 止玄秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 -54068 无锋秘录 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54057 御风法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54058 困雨法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54059 折雪法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54060 碎土法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54061 叠云法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54062 藏雷法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54063 残雾法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54064 踏江法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54065 悬河法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54066 镜湖法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54067 止玄法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 +54068 无锋法铃 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54071 神行战甲 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54072 乘风战甲 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 54074 破空战甲 false 3 1 4 0 1 15013 0 0 0 1 0 1 1 @@ -896,10 +896,10 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 55046 月耀神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55047 赤阳神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55048 神华神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55049 弹指神矛 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55050 刹那神矛 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55051 一念神矛 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55052 须臾神矛 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55049 弹指神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55050 刹那神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55051 一念神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55052 须臾神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55053 劫火神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55054 破锋神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55055 寂灭神戟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 @@ -924,24 +924,24 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 55076 太玄古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55078 无始古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55080 道衍古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55081 断念钟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55082 斩尘尺 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55083 凝墨瓶 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55084 碎弦琴 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55085 星落圣典 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55086 月耀圣典 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55087 赤阳圣典 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55088 神华宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55089 弹指宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55090 刹那宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55091 一念宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55092 须臾宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55093 劫火宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55094 破锋宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55095 寂灭宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55096 太玄宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55098 无始宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -55099 归凡宝录 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55081 断念圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55082 斩尘圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55083 凝墨圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55084 碎弦圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55085 星落圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55086 月耀圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55087 赤阳圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55088 神华圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55089 弹指圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55090 刹那圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55091 一念圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55092 须臾圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55093 劫火圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55094 破锋圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55095 寂灭圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55096 太玄圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55098 无始圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +55099 归凡圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55101 虬龙仙甲 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55102 神凰羽衣 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 55103 饕餮战衣 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 @@ -1040,7 +1040,7 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in 65021 断念神剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65041 断念神斧 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65061 断念古剑 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 -65081 断念钟 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 +65081 断念圣铃 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65101 虬龙仙甲 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65116 灵犀头巾 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 65131 青麟羽鞋 false 3 1 5 0 1 15014 0 0 0 1 0 1 1 diff --git a/conf/server/PassiveSkillLogicConfig.txt b/conf/server/PassiveSkillLogicConfig.txt index 3b075a3b7..747869dbf 100644 --- a/conf/server/PassiveSkillLogicConfig.txt +++ b/conf/server/PassiveSkillLogicConfig.txt @@ -144,3 +144,4 @@ int int mut,float#float,1 540008 47 12#0.2#2 540009 47 12#0.2#2 1 45 0 +2 45 1 diff --git a/conf/server/RunesPoolConfig.txt b/conf/server/RunesPoolConfig.txt index 7eafa6df8..3eb193311 100644 --- a/conf/server/RunesPoolConfig.txt +++ b/conf/server/RunesPoolConfig.txt @@ -49,14 +49,14 @@ int int int int int int 310056 56 10 20 31 100 320055 55 1 5 32 100 330101 101 1 4 33 100 -340102 102 1 4 34 100 -350103 103 1 4 35 100 +340103 103 1 4 34 100 +350102 102 1 4 35 100 360104 104 1 4 36 100 370105 105 1 4 37 100 380106 106 1 4 38 100 390107 107 1 4 39 100 -400108 108 1 4 40 100 -410109 109 1 4 41 100 +400109 109 1 4 40 100 +410108 108 1 4 41 100 420110 110 1 4 42 100 430111 111 1 4 43 100 440112 112 1 4 44 100 diff --git a/conf/server/SkillLogicConfig.txt b/conf/server/SkillLogicConfig.txt index 554f451d9..3dc92de93 100644 --- a/conf/server/SkillLogicConfig.txt +++ b/conf/server/SkillLogicConfig.txt @@ -1045,13 +1045,13 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float 3002111 20001#0.7 1#13 0.848#1|2#0.1#2#4 0.0 3002112 20002#0.7 1#13 0.432#1|2#0.1#2#4 1.0 3002121 20001#0.7 1#13 1.408#1|2#0.15#2#4 0.0 -3002122 20002#0.7 1#13 0.432#1|2#0.1#2#4 2.0 -3002131 20000#0.7 22 0.693#2#2#0.2 0.0 -3002132 10000#0.7 24 1#0.693 2.0 -3002311 20001#0.7 1 4.16#1 6.0 -3002321 20001#0.7 1#13 0.848#1|2#0.1#2#4 0.0 -3002322 20001#0.7 1#13 1.072#1|3#0.2#1#4 1.5 -3002331 20001#0.7 1#13 0.58#2|2#0.15#2#10 0.0 -3002332 20000#0.7 2#3 0.915#2|0.2#1#3 2.0 -3002341 20001#0.7 10 1.48#2#0.4 0.0 -3002342 20000#0.7 2#4 0.776#2|3#0.2#12#4 2.0 +3002122 20002#0.7 1#13 0.64#1|2#0.1#2#4 2.0 +3002131 20000#0.7 22 1.04#2#2#0.2 0.0 +3002132 10000#0.7 24 1#1.317 2.0 +3002311 20001#0.7 1 4.992#1 4.5 +3002321 20001#0.7 1#13#4 0.848#1|2#0.1#2#4|4#0.2#12#4 0.0 +3002322 20001#0.7|30000#0.7 1#13|4 1.072#1|3#0.2#1#4|4#0.2#9#2 1.5 +3002331 20001#0.7 1#13 0.58#2|2#0.1#2#15 0.0 +3002332 20000#0.7 22#3 0.915#2#2#0.2|0.2#1#3 2.0 +3002341 20001#0.7 10 2.08#2#0.3 0.0 +3002342 20000#0.7 2#4 0.776#2|3#0.2#18#4 2.0 diff --git a/conf/server/StoreConfig.txt b/conf/server/StoreConfig.txt index 384b917d5..e5fffceac 100644 --- a/conf/server/StoreConfig.txt +++ b/conf/server/StoreConfig.txt @@ -311,7 +311,7 @@ int string int int int mut,int#int,1 mut,int#int,1 int mut,int#int,2 int int int 510 挑战券 8 1 100 1#504 23#1 1 16|0#0#0#20 0 1 0 0 511 挑战券 8 1 100 1#505 23#5 1 16|0#0#0#100 0 1 0 0 512 挑战券 8 1 100 1#506 23#10 1 16|0#0#0#200 0 1 0 0 -513 挑战券 8 1 100 1#506 23#10 1 16|0#0#0#120000 0 1 0 0 +513 挑战券 8 1 100 1#506 23#10 1 14|0#0#0#120000 0 1 0 0 514 梦魇妖壶 8 1 100 1#489 4#300 1 16|0#0#0#200 0 1 0 0 515 梦魇妖壶 8 1 100 1#490 4#600 1 16|0#0#0#400 0 1 0 0 516 梦魇妖壶 8 1 100 1#493 4#300 1 14|0#0#0#120000 0 1 0 0 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 0aa0dd9fa..9046def3e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -205,7 +205,7 @@ public class GMRequestHandler extends BaseHandler{ PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0); break; case GlobalGm.CREATE_INVADE: - CombatLogic.getInstance().randomInvasionBoss(iSession.getUid(),prarm1,100); + CombatLogic.getInstance().randomInvasionBoss(iSession.getUid(),prarm1,100,true); default: } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 32de521a2..5f0b73526 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -353,8 +353,8 @@ public class ArenaLogic { for(int[] item: interval){ int low = item[0]; int high = item[1]; - Set arenaRank = RedisUtil.getInstence().getZsetRange(RedisKey.ARENA_RANK,Integer.toString(curSeason), myScore * low / 100.0f-1, myScore * high / 100.0f +1); - LOGGER.info("curSeason={},the uid={},the myscore={},the low={},the high={},mylow={},myhigh={},",curSeason,uid,myScore,low,high,myScore * low / 100.0f-1,myScore * high / 100.0f +1); + Set arenaRank = RedisUtil.getInstence().getZsetRange(RedisKey.ARENA_RANK,Integer.toString(curSeason), myScore * low / 10000.0f-1, myScore * high / 10000.0f +1); + LOGGER.info("curSeason={},the uid={},the myscore={},the low={},the high={},mylow={},myhigh={},",curSeason,uid,myScore,low,high,myScore * low / 10000.0f-1,myScore * high / 10000.0f +1); if(arenaRank!=null && !arenaRank.isEmpty()){ LOGGER.info("arenRank-->{}",arenaRank); arenaRank.remove(Integer.toString(uid)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java index cabe117dc..b9b425c34 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/AdventureStateInfo.java @@ -23,7 +23,6 @@ public class AdventureStateInfo extends MongoBase { this.level=1; this.startTime = now; this.findBossTime = now; - } public int getStartTime() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index bdd7dee99..e111f080a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -214,7 +214,7 @@ public class CombatLogic { } if(randomTimes>0){ - int bossGroupId = randomInvasionBoss(uid, adventureStateInfo.getPosition(),randomTimes); + int bossGroupId = randomInvasionBoss(uid, adventureStateInfo.getPosition(),randomTimes,false); if(bossGroupId>0){ remainTime =sAdventureConfig.getInvasionBossHolding(); nextFlushTime+=remainTime+nextFlushTime; @@ -528,7 +528,7 @@ public class CombatLogic { MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_BOSSHURT_RESPONSE_VALUE,builder.build(),true); } - public int randomInvasionBoss(int uid,int arenaID,int randomTimes) throws Exception { + public int randomInvasionBoss(int uid,int arenaID,int randomTimes,boolean isGm) throws Exception { LOGGER.info("the uid={},the arenaId={},the times={}",uid,arenaID,randomTimes); User user = UserManager.getUser(uid); AdventureManager adventureManager = user.getAdventureManager(); @@ -543,7 +543,11 @@ public class CombatLogic { totalWeight+=item[1]; } int bossGroupID =0; - while (randomTimes-->0 && bossGroupID==0){ + int reallyRandomTimes=randomTimes; + if(!isGm && randomTimes>3){ + reallyRandomTimes=3; + } + while (reallyRandomTimes-->0 && bossGroupID==0){ int randomInt = MathUtils.randomInt(totalWeight); for(int[] item :invasionBossWeightInfo){ randomInt-=item[1]; @@ -554,7 +558,13 @@ public class CombatLogic { totalWeight+=item[1]; } } - int now = (int)(System.currentTimeMillis()/1000); + int findBossTime = adventureStateInfo.getFindBossTime(); + int now=0; + if(isGm || findBossTime == 0){ + now = (int)(System.currentTimeMillis()/1000); + }else{ + now = findBossTime + sAdventureConfig.getInvasionBossHolding() * (randomTimes - reallyRandomTimes); + } String bossId=""; if(bossGroupID != 0){ bossId = KeyGenUtils.produceIdByModule(UUIDEnum.ADVENTUREBOSS, user.getId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index f0ebf014a..08d594e80 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -263,7 +263,7 @@ public class MissionLoigc { if(value.getStars().contains(MapLogic.STAR_1)){ Integer fightId = item.getKey(); SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId); - if(sChallengeConfig.getType() == 3 && sChallengeConfig.getDifficultType() == missionSubType[0]){ + if(sChallengeConfig.getType() == 3 && sChallengeConfig.getDifficultType() == missionSubType[0] && sChallengeConfig.getDifficultType() == missionSubType[1]){ count++; } }