From 940c85bd2fa2ab271d698658d4ce318b187b874f Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期日, 30 十二月 2018 15:59:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 12 ++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 12 ++++++------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetItemTime.pyc | 0
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 36c4a8b..982778f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -776,17 +776,17 @@
33409002 寒冰守卫 41
33409003 建造点 1
33402001 第一波小怪 1
-33403001 黄金Boss 1
+33403001 金色战神 1
33402002 第二波小怪 1
-33403002 Boss 1
+33403002 狂暴巨猿 1
33402003 第三波小怪 1
-33403003 Boss 1
+33403003 狂暴巨猿 1
33402004 第四波小怪 1
-33403004 Boss 1
+33403004 狂暴巨猿 1
33402005 第五波小怪 1
-33403005 Boss 1
+33403005 狂暴巨猿 1
33402006 第六波小怪 1
-33403006 Boss 1
+33403006 狂暴巨猿 1
60103001 妖兵 30
60103002 机关幻兽 40
60103003 符塔狂豹 50
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index edf4d7e..6c6c760 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/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
index fdcd6e8..5e08d8e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetItemTime.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetItemTime.pyc
new file mode 100644
index 0000000..9bbcf89
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetItemTime.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
index fbdc85f..9ecdc22 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
index 9f3112c..39ebf61 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index b674aaf..e428ab4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index 866d730..996a393 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index ec963a9..4229eea 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.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 f8d51bc..e366eea 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3bd2ed2..2e35a8e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -262,7 +262,7 @@
DiceFreeNum 5
DiceRandomList {0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}
TJG int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times 300 72000 {1:[50900, 50902],2:[55900,55902]} 48215|48235|48245|48260|48275|48320|48290
-AutoUseGuardian 4101|4106 300
+AutoUseGuardian 4106|4101 300
TJGGiftTime 36000
ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688],"4106":[4106,668,0],"4107":[4107,468,0]}
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4))))
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2178dcf..ccbb074 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -776,17 +776,17 @@
33409002 2 0 寒冰守卫 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 800 5733 0 0 300 2 5 23052 0 0 0 0 0 0 0 0 5 2 578 0 0 0 0 0 295 0 66 1 1
33409003 9 0 建造点 1 0 3 3 3 0 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
33402001 2 0 第一波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403001 2 0 黄金Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403001 2 0 金色战神 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402002 2 0 第二波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403002 2 0 Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403002 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402003 2 0 第三波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 250 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403003 2 0 Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 250 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403003 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 250 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402004 2 0 第四波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403004 2 0 Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403004 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402005 2 0 第五波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403005 2 0 Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403005 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402006 2 0 第六波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
-33403006 2 0 Boss 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
+33403006 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
60103001 2 0 妖兵 30 0 71 71 0 0 0 0 0 48 0 0 0 0 0 0 19888 101 800 19888 8 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 180 1 1
60103002 2 0 机关幻兽 40 0 89 89 0 0 0 0 0 52 0 0 0 0 0 0 20112 101 800 20112 10 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 180 1 1
60103003 2 0 符塔狂豹 50 0 103 103 0 0 0 0 0 83 0 0 0 0 0 0 22454 101 800 22454 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 180 1 1
--
Gitblit v1.8.0