From 828c4ef4bb7b8ea9668cc9bee981fb0b9a780ef3 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 18 十二月 2018 21:05:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt                  |   26 ++++++++++++++++++++++++++
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                        |    0 
 db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt                        |   26 ++++++++++++++++++++++++++
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc     |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                             |    1 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc |    0 
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                          |    0 
 8 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt
new file mode 100644
index 0000000..85b388e
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt
@@ -0,0 +1,26 @@
+DanLV	LVUpScore
+0	20
+1	50
+2	100
+3	200
+4	300
+5	400
+6	500
+7	600
+8	700
+9	800
+10	900
+11	1000
+12	1100
+13	1200
+14	1300
+15	1400
+16	1500
+17	1600
+18	1700
+19	1800
+20	1900
+21	2000
+22	2100
+23	2200
+24	0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index bfbdd5b..105502e 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 d2f9cf8..84d4348 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 015cd6b..855ae7f 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.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 8492cb3..7e6c8e0 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 d3936eb..2ce4e2f 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/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
new file mode 100644
index 0000000..9ceb30a
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
@@ -0,0 +1,26 @@
+DanLV	LVUpScore	DanLVAwardList	SeasonAwardList
+0	20	[[1024,1,1]]	[[1024,1,1]]
+1	50	[[1024,1,1]]	[[1024,1,1]]
+2	100	[[1024,1,1]]	[[1024,1,1]]
+3	200	[[1024,1,1]]	[[1024,1,1]]
+4	300	[[1024,1,1]]	[[1024,1,1]]
+5	400	[[1024,1,1]]	[[1024,1,1]]
+6	500	[[1024,1,1]]	[[1024,1,1]]
+7	600	[[1024,1,1]]	[[1024,1,1]]
+8	700	[[1024,1,1]]	[[1024,1,1]]
+9	800	[[1024,1,1]]	[[1024,1,1]]
+10	900	[[1024,1,1]]	[[1024,1,1]]
+11	1000	[[1024,1,1]]	[[1024,1,1]]
+12	1100	[[1024,1,1]]	[[1024,1,1]]
+13	1200	[[1024,1,1]]	[[1024,1,1]]
+14	1300	[[1024,1,1]]	[[1024,1,1]]
+15	1400	[[1024,1,1]]	[[1024,1,1]]
+16	1500	[[1024,1,1]]	[[1024,1,1]]
+17	1600	[[1024,1,1]]	[[1024,1,1]]
+18	1700	[[1024,1,1]]	[[1024,1,1]]
+19	1800	[[1024,1,1]]	[[1024,1,1]]
+20	1900	[[1024,1,1]]	[[1024,1,1]]
+21	2000	[[1024,1,1]]	[[1024,1,1]]
+22	2100	[[1024,1,1]]	[[1024,1,1]]
+23	2200	[[1024,1,1]]	[[1024,1,1]]
+24	0	[[1024,1,1]]	[[1024,1,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 014388b..6223f6e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -326,3 +326,4 @@
 GatherSoulHole	0_300|1_300|2_305|3_310|4_315|5_320|6_330				
 GatherSoulMaxLevel	1_50|2_50|3_50|4_50|5_50				
 GatherSoulLevelUp	int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))	1_0.5|2_0.7|3_0.8|4_0.9|5_1	1_0.5|2_0.7|3_0.8|4_0.9	1_100|2_300|3_3000|4_15000|5_30000	
+GatherSoulPackCount	150				

--
Gitblit v1.8.0