From 0d2877adc20141da840964a1c0bc14e6deda9584 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期三, 23 一月 2019 21:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagChests.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index ef48f61..52a01f9 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -224,7 +224,7 @@
797 131 0 0
798 132 0 0
799 133 0 0
-800 134 0 0
+800 133 0 0
1320 135 0 0
1321 136 0 0
801 19 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index e382d17..82f7c54 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 733b7b4..b25fcf7 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -50,6 +50,6 @@
49 2019-1-23 2019-1-23 110 0 [[130]] SellMail3
50 2019-1-27 2019-1-27 110 0 [[131]] SellMail3
51 2019-1-28 2019-1-28 110 0 [[132]] SellMail3
-52 2019-1-29 2019-1-29 110 0 [[133,134]] SellMail3
+52 2019-1-29 2019-1-29 110 0 [[133]] SellMail3
53 2019-1-31 2019-1-31 110 0 [[135]] SellMail3
54 2019-2-2 2019-2-2 110 0 [[136]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index e1ee93c..318c985 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -235,9 +235,9 @@
2443 0 0 0 0 1
2444 0 0 0 0 1
2445 0 0 0 0 1
-2446 0 0 0 0 1
-2447 0 0 0 0 1
-2448 0 0 0 0 1
+2446 0 0 0 1 1
+2447 0 0 0 1 1
+2448 0 0 0 1 1
2449 0 0 0 1 0
2450 0 0 0 1 1
2451 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8cd66ae..2205657 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -271,7 +271,7 @@
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)))) {"79":"min(maxOOPValue,int(132141*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))", "80":"min(maxOOPValue,int(79285*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))"}
BossStoneDelayTime 1500
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
-RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108,129,130,131,132,133], 1, 8, 7200], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128], 1, 15, 300]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60]}}
+RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108,129,130,131,132,133], 1, 8, 0, 2], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128], 1, 15, 300, 0]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 0, 2], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60, 0]}}
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
@@ -337,4 +337,4 @@
ShareUseCntItem [[2387,2428,2430],[2388,2429]]
ChangeOldItem {102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}
ZhuXianBossCntCfg 3 8 5
-ZhuXianTowerBossTime min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48-1,10),119) 8 5
+ZhuXianTowerBossTime int(min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48-1,10),119)) 8 5
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index bfb8104..eb76abe 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -224,7 +224,7 @@
797 131 1 5700 6 1 [] 0 0 0 0 1 0 1 588 1500 0 LimitGift6
798 132 1 913 1 1 [[4694,12,1]] 913 0 0 0 1 0 1 388 1600 0 LimitGift6
799 133 1 912 1 1 [[5303,200,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
-800 134 1 4607 1 1 [[2213,50,1]] 4607 0 0 0 1 0 1 588 2625 0 LimitGift6
+800 133 1 4607 1 1 [[2213,50,1]] 4607 0 0 0 1 0 1 588 2625 0 LimitGift6
1320 135 1 912 1 1 [[1128,1,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
1321 136 1 110 50 1 [[112,25,1]] 110 0 0 0 1 0 1 388 1600 0 LimitGift6
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
--
Gitblit v1.8.0