From 494b25f3da72f84c607553d248cf174e7ebe3d1e Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 25 十二月 2018 10:50:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index 682271f..a1bac70 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -196,7 +196,7 @@
195 ['金']
196 ['精忠报国']
197 ['119']
-198 ['4','四']
+198 ['4','四','4年','四年']
199 ['施耐庵']
200 ['宋朝','宋']
201 ['隋朝','隋']
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
index fcb68d3..fe63ba0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1edc1c5..4f35b9f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -325,5 +325,5 @@
CrossRealmPKFB [30, 3, 60,30,10] [[15,20,20,15,0], [33,25,25,33,0]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
-GatherSoulLevelUp 2960210*(0+0.3*((level-1)/49.0)+0.35*pow((level-1)/49.0,2)+0.25*pow((level-1)/49.0,3)+0.1*pow((level-1)/49.0,4)) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
+GatherSoulLevelUp 2960210*(0+0.3*((level-1)/49.0)+0.35*pow((level-1)/49.0,2)+0.25*pow((level-1)/49.0,3)+0.1*pow((level-1)/49.0,4))-2960210*(0+0.3*((level-2)/49.0)+0.35*pow((level-2)/49.0,2)+0.25*pow((level-2)/49.0,3)+0.1*pow((level-2)/49.0,4)) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
GatherSoulPackCount 150
--
Gitblit v1.8.0