From 8fe057c884c111780ebbd2de027a5ee7a92532a5 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 25 十月 2018 11:56:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4
CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 2
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagTalentSkill.txt | 124 +++++++++++++++++++++--------------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc | 0
db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 2
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6 +-
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
21 files changed, 77 insertions(+), 68 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
index 4d69ba7..eb3c37f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
@@ -10,7 +10,7 @@
9 5 200 2 5 0
10 5 200 2 5 0
11 5 200 2 5 0
-12 5 25 2 5 0
+12 5 100 2 4 0
13 5 25 2 5 0
14 5 25 2 5 0
15 5 25 2 5 0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index adb3112..61c2005 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index b6f60a1..19712a8 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index ca18c6f..c0acf61 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 6acc6d0..2a16803 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -334,7 +334,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 16
+RegisterPackCount = 17
PacketCMD_1 = 0xA5
PacketSubCMD_1 = 0x04
@@ -400,6 +400,10 @@
PacketSubCMD_16=0x27
PacketCallFunc_16=OnQueryMapNPCCntInfo
+PacketCMD_17=0xA2
+PacketSubCMD_17=0x29
+PacketCallFunc_17=OnSetLittleHelper
+
;购买相关的
[BuySomething]
ScriptName = Event\EventSrc\Operate_PlayerBuyZhenQi.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 54f7487..f917dc8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index cc07e82..8f93313 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 2e2f499..205a8fe 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
index ee35305..4f320ba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index ce82101..c0fdc90 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
index 7a85d6f..6d2e01c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 4c2b7ce..0e2cbf9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
index b089274..2b0630b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
index da0849b..3548f1c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 9999ee9..7957236 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 51bf66f..b80c1dc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 15b6078..1092407 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -135,15 +135,15 @@
2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
2349 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
2350 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
-2351 0 4151_5 [[10000,[4253,1]]] [[9900,0],[10000,1]] [4253]
+2351 0 4151_5 [[10000,[4253,1]]] [[7000,0],[10000,1]] [4253]
2352 0 4151_10 [[10000,[4253,1]]] 1 [4253]
2353 0 4151_10 [[10000,[4253,1]]] [[5000,0],[10000,1]] [4253]
2354 0 4151_10 [[10000,[4253,1]]] [[7500,0],[10000,1]] [4253]
-2355 0 181_5 [[10000,[224,1]]] [[9900,0],[10000,1]] [224]
+2355 0 181_5 [[10000,[224,1]]] [[7000,0],[10000,1]] [224]
2356 0 181_10 [[10000,[224,1]]] 1 [224]
2357 0 181_10 [[10000,[224,1]]] [[5000,0],[10000,1]] [224]
2358 0 181_10 [[10000,[224,1]]] [[7500,0],[10000,1]] [224]
-2359 0 4151_5 [[10000,[4252,1]]] [[9900,0],[10000,1]] [4252]
+2359 0 4151_5 [[10000,[4252,1]]] [[7000,0],[10000,1]] [4252]
2360 0 4151_10 [[10000,[4252,1]]] 1 [4252]
2361 0 4151_10 [[10000,[4252,1]]] [[5000,0],[10000,1]] [4252]
2362 0 4151_10 [[10000,[4252,1]]] [[7500,0],[10000,1]] [4252]
diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
index aac3db7..29d23ab 100644
--- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
@@ -10,7 +10,7 @@
9 5 200 2 5
10 5 200 2 5
11 5 200 2 5
-12 5 25 2 5
+12 5 100 2 4
13 5 25 2 5
14 5 25 2 5
15 5 25 2 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3877712..cf70b66 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -61,7 +61,7 @@
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
-LVUPAddPoint 0|0|0 0 0 0 0
+LVUPAddPoint {(221,250):6,(251,300):12} 200 0 0 0
PointAttr1 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.2) 0 0 0 0
PointAttr2 6_CON*6|7_int(0.6*PNE)|8_int(0.3*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.3) 0 0 0 0
PointAttr3 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.4) 0 0 0 0
@@ -77,7 +77,7 @@
ExpAttenuation max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1) 0 0 0 0
AtkInterval int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5)) 0 0 0 0
MoveSpeed max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100) 50 25 0 0
-FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*240000)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
+FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index cbf49aa..4135f60 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -282,6 +282,7 @@
774 10 1 201|20 0 0 0 0 9
775 12 6 0 0 0 0 0 10
776 120 80 0 0 0 0 0 11
+777 6 2 0 0 0 0 0 12
801 30 1 1 0 0 0 0 0
802 30 1 2 0 0 0 0 0
803 30 1 3 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
index 8f5e0bb..67b7a67 100644
--- a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
@@ -1,61 +1,65 @@
skillId type series
-51200 1 1
-51250 1 1
-51300 1 1
-51350 1 1
-51400 1 1
-51450 1 1
-51500 1 1
-51550 1 1
-51600 1 2
-51650 1 2
-51700 1 2
-51750 1 2
-51800 1 2
-51850 1 2
-51900 1 2
-51950 1 2
-52000 1 2
-52050 1 2
-52100 1 3
-52150 1 3
-52200 1 3
-52250 1 3
-52300 1 3
-52350 1 3
-52400 1 3
-52450 1 3
-52500 1 3
-52550 2 1
-52600 2 1
-52650 2 1
-52700 2 1
-52750 2 1
-52800 2 1
-52850 2 1
-52900 2 1
-52950 2 2
-53000 2 2
-53050 2 2
-53100 2 2
-53150 2 2
-53200 2 2
-53250 2 2
-53300 2 2
-53350 2 2
-53400 2 2
-53450 2 3
-53500 2 3
-53550 2 3
-53600 2 3
-53650 2 3
-53700 2 3
-53750 2 3
-53800 2 3
-53850 2 3
-53900 2 3
-53950 2 3
-54000 2 3
-54050 2 3
-54100 2 3
-54150 2 3
+30000 1 1
+30050 1 1
+30100 1 1
+30150 1 1
+30200 1 1
+30250 1 1
+30300 1 1
+30350 1 1
+30400 1 1
+30450 1 1
+30500 1 1
+30550 1 2
+30600 1 2
+30650 1 2
+30700 1 2
+30750 1 2
+30800 1 2
+30850 1 2
+30900 1 2
+30950 1 2
+31000 1 2
+32050 1 3
+32100 1 3
+32150 1 3
+32200 1 3
+32250 1 3
+32300 1 3
+32350 1 3
+32400 1 3
+32450 1 3
+32500 1 3
+32550 1 3
+35000 2 1
+35050 2 1
+35100 2 1
+35150 2 1
+35200 2 1
+35250 2 1
+35300 2 1
+35350 2 1
+35400 2 1
+35450 2 1
+35500 2 1
+35550 2 2
+35600 2 2
+35650 2 2
+35700 2 2
+35750 2 2
+35800 2 2
+35850 2 2
+35900 2 2
+35950 2 2
+36000 2 2
+37100 2 3
+37150 2 3
+37200 2 3
+37250 2 3
+37300 2 3
+37350 2 3
+37400 2 3
+37450 2 3
+37500 2 3
+37550 2 3
+37600 2 3
--
Gitblit v1.8.0