From b7847cd2e8c8b259f0ab1c1e5f94b9a830967891 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期五, 31 八月 2018 18:54:20 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0 db/PyMongoDataServer/PySysDB/tagStore.txt | 8 ++-- CoreServerGroup/GameServer/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 4 +- CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 3 + ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 51 +++++++++++++------------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 4 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagFamily.txt | 22 +++++----- CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc | 0 18 files changed, 47 insertions(+), 45 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt index 03306b8..0b1761e 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt @@ -1,11 +1,11 @@ -familyLV memberCnt deputyLeaderCnt eliteCnt needMoney weekMissionMoneyMax -1 30 1 5 930000 16275000 -2 32 1 5 1860000 17360000 -3 34 1 5 3022500 18445000 -4 36 1 5 5812500 19530000 -5 38 1 5 15112500 20615000 -6 40 1 5 24180000 21700000 -7 42 1 5 48360000 22785000 -8 44 1 5 120900000 23870000 -9 46 1 5 362700000 24955000 -10 48 1 5 465000000 26040000 +familyLV memberCnt deputyLeaderCnt eliteCnt needMoney weekMissionMoneyMax bossFBCnt +1 30 1 5 930000 16275000 1 +2 32 1 5 1860000 17360000 2 +3 34 1 5 3022500 18445000 3 +4 36 1 5 5812500 19530000 3 +5 38 1 5 15112500 20615000 4 +6 40 1 5 24180000 21700000 4 +7 42 1 5 48360000 22785000 5 +8 44 1 5 120900000 23870000 5 +9 46 1 5 362700000 24955000 6 +10 48 1 5 465000000 26040000 6 diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc index 85b1f81..ba85114 100644 --- a/CoreServerGroup/GameServer/Script/ChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc index e399673..c893cbe 100644 --- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc +++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc index 59f68c4..589f7f2 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc index 0098034..46ed178 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index fd438e0..334979e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -26,6 +26,7 @@ # suppressRealmHurtPer 境界压制加成百分比，存在负数, 配表获取 # isLuckyHit 是否会心一击 0否1是 # isSuperHit 是否暴击 0否1是 +# wReFightPower 世界等级对应等级表参考战力 固定值 # # 攻击方： # aLV 等级 固定值 @@ -129,7 +130,7 @@ "EVP_1_31190" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))", #抢boss - "PVE_1_5" :"int(aReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))", + "PVE_1_5" :"int(wReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))", } diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index fc17850..e036868 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc index 6ca15ff..357c9ff 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc index 5962fb2..8ef0728 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc index 3fbb673..0a4ce63 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc index 0b2fc4b..760056a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc index 97f4cc0..110f299 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc index 7a36b92..a31c0b0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc index 400e6a7..c5a8598 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index cc1e494..1afb8c8 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -127,8 +127,8 @@ 2340 0 [[3000,[181,20]],[6000,[181,25]],[8000,[181,30]],[9000,[181,35]],[10000,[181,40]]] 1 2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14] 2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1 -2343 0 181_38 -2344 0 181_100 +2343 0 181_50 +2344 0 181_120 2345 0 106_8 2346 0 [[5000,[3504,1]],[10000,[3514,1]]] 1 2347 0 [[5000,[3505,1]],[10000,[3515,1]]] 1 diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt index d8708cd..64099d5 100644 --- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt +++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt @@ -1,6 +1,6 @@ GiftbagID GiftbagType OriginalRMB BuyCountLimit GiftItemList MainItemID NotifyKey 2 1 88 1 [(196,1,0)] 196 LimitGift3 4 2 130 1 [(913,1,0),(181,80,0)] 913 LimitGift3 -5 3 200 1 [(4608,2,0),(4151,100,0)] 4608 LimitGift3 -7 4 320 1 [(4214,1,0),(181,180,0)] 4214 LimitGift3 +5 3 200 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3 +7 4 320 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3 8 5 600 1 [(4606,2,0),(4607,2,0)] 4606 LimitGift3 diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt index af8e328..8bfe2e1 100644 --- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt @@ -205,28 +205,29 @@ 204 9016 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1 205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1 206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1 -207 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1 -208 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1 -209 3502 0 0 3501 3 0 10000 0 0 0 1 -210 3503 0 0 3502 3 0 10000 0 0 0 1 -211 3504 0 0 3503 3 0 10000 0 0 0 1 -212 3505 0 0 3504 3 0 10000 0 0 0 1 -213 3506 0 0 3505 3 0 10000 0 0 0 1 -214 3507 0 0 3506 3 0 10000 0 0 0 1 -215 3508 0 0 3507 3 0 10000 0 0 0 1 -216 3512 0 0 3511 3 0 10000 0 0 0 1 -217 3513 0 0 3512 3 0 10000 0 0 0 1 -218 3514 0 0 3513 3 0 10000 0 0 0 1 -219 3515 0 0 3514 3 0 10000 0 0 0 1 -220 3516 0 0 3515 3 0 10000 0 0 0 1 -221 3517 0 0 3516 3 0 10000 0 0 0 1 -222 3518 0 0 3517 3 0 10000 0 0 0 1 -223 5012 0 0 5301 5 0 10000 0 0 0 1 -224 5022 0 0 5301 5 0 10000 0 0 0 1 -225 250 0 0 224 5 0 10000 0 0 EquipComposeSuccess3 2 -226 260 0 0 222 10 0 10000 0 0 EquipComposeSuccess3 2 -227 258 0 0 223 30 0 10000 0 0 EquipComposeSuccess3 2 -228 4202 0 0 4253 3 0 10000 0 0 EquipComposeSuccess3 2 -229 4213 0 0 4252 5 0 10000 0 0 EquipComposeSuccess3 2 -230 4209 0 0 4250 10 0 10000 0 0 EquipComposeSuccess3 2 -231 4210 0 0 4251 30 0 10000 0 0 EquipComposeSuccess3 2 +207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1 +208 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1 +209 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1 +210 3502 0 0 3501 3 0 10000 0 0 0 1 +211 3503 0 0 3502 3 0 10000 0 0 0 1 +212 3504 0 0 3503 3 0 10000 0 0 0 1 +213 3505 0 0 3504 3 0 10000 0 0 0 1 +214 3506 0 0 3505 3 0 10000 0 0 0 1 +215 3507 0 0 3506 3 0 10000 0 0 0 1 +216 3508 0 0 3507 3 0 10000 0 0 0 1 +217 3512 0 0 3511 3 0 10000 0 0 0 1 +218 3513 0 0 3512 3 0 10000 0 0 0 1 +219 3514 0 0 3513 3 0 10000 0 0 0 1 +220 3515 0 0 3514 3 0 10000 0 0 0 1 +221 3516 0 0 3515 3 0 10000 0 0 0 1 +222 3517 0 0 3516 3 0 10000 0 0 0 1 +223 3518 0 0 3517 3 0 10000 0 0 0 1 +224 5012 0 0 5301 5 0 10000 0 0 0 1 +225 5022 0 0 5301 5 0 10000 0 0 0 1 +226 250 0 0 224 5 0 10000 0 0 EquipComposeSuccess3 2 +227 260 0 0 222 10 0 10000 0 0 EquipComposeSuccess3 2 +228 258 0 0 223 30 0 10000 0 0 EquipComposeSuccess3 2 +229 4202 0 0 4253 3 0 10000 0 0 EquipComposeSuccess3 2 +230 4213 0 0 4252 5 0 10000 0 0 EquipComposeSuccess3 2 +231 4209 0 0 4250 10 0 10000 0 0 EquipComposeSuccess3 2 +232 4210 0 0 4251 30 0 10000 0 0 EquipComposeSuccess3 2 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 50e2e38..a121039 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -109,10 +109,10 @@ 704 15 0 2344 1 1 [] 2344 0 0 106 1 1 288 1000 2 OpenTakePreferential2 705 15 0 4 4 1 [] 4 0 0 106 1 1 88 240 3 OpenTakePreferential1 706 15 0 5 5 1 [[912,1,1]] 5 0 0 106 1 1 288 700 3 OpenTakePreferential2 -707 15 0 3513 2 1 [[3503,2,1]] 3513 0 0 106 1 1 88 360 4 OpenTakePreferential1 -708 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 1 288 1080 4 OpenTakePreferential2 -709 15 0 912 1 1 [[30,100,1]] 912 0 0 106 1 1 88 250 5 OpenTakePreferential1 -710 15 0 913 1 1 [[30,388,1]] 913 0 0 106 1 1 388 888 5 OpenTakePreferential2 +707 15 0 3514 1 1 [[3504,1,1]] 0 0 0 106 1 1 88 360 4 OpenTakePreferential1 +708 15 0 3515 1 1 [[3505,1,1]] 3514 0 0 106 1 1 288 1080 4 OpenTakePreferential2 +709 15 0 912 1 1 [[30,150,1]] 912 0 0 106 1 1 88 250 5 OpenTakePreferential1 +710 15 0 913 1 1 [[30,500,1]] 913 0 0 106 1 1 388 888 5 OpenTakePreferential2 711 15 0 2213 20 1 [] 0 0 0 106 1 1 88 250 6 OpenTakePreferential1 712 15 0 1128 1 1 [[2213,60,1]] 1128 0 0 106 1 1 388 1000 6 OpenTakePreferential2 713 15 0 30 388 1 [] 0 0 0 106 1 1 188 388 7 OpenTakePreferential1 -- Gitblit v1.8.0