From b3c43648be9cb62f594288e17d881fa92ced606e Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 09 十一月 2018 16:37:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt | 2
db/PyMongoDataServer/PySysDB/tagStore.txt | 41 ++++++++++++++------
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt | 2
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 2
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 41 ++++++++++++++------
5 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index e677f1e..bdddccf 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,2 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset ShopTypeList
-1 OpenServer [] [] 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]]
+1 OpenServer [] [] 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 45f5312..c05bcb6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -185,15 +185,32 @@
905 30 7 0
906 30 7 0
909 30 7 0
-1001 38 0 5
-1002 38 0 10
-1003 38 0 15
-1004 38 0 20
-1005 38 0 25
-1006 39 0 30
-1007 39 0 35
-1008 39 0 40
-1009 39 0 45
-1010 39 0 50
-1011 39 0 55
-1012 39 0 60
+1001 200 0 1
+1002 200 0 5
+1003 200 0 20
+1004 200 0 50
+1005 200 0 0
+1006 200 0 0
+1007 201 0 1
+1008 201 0 2
+1009 201 0 5
+1010 201 0 10
+1011 201 0 10
+1012 201 0 20
+1013 201 0 0
+1014 201 0 0
+1015 202 0 2
+1016 202 0 3
+1017 202 0 3
+1018 202 0 5
+1019 202 0 10
+1020 202 0 0
+1021 202 0 0
+1022 203 0 1
+1023 203 0 1
+1024 203 0 1
+1025 203 0 20
+1026 203 0 5
+1027 203 0 10
+1028 203 0 0
+1029 203 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 6fe7819..25ed1d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,2 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
-1 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 100 1 [[38,39,38,39,38],[39,38,39,39,39],[39,38,39,38,39]] SellMail5
+1 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 100 1 [[200,201,202,203]] SellMail5
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 0a3ac25..983c1ad 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -1,5 +1,5 @@
EquipClass EquipColor EquipStar AtkPerC DamagePerC SuperHitRateC SuperHitPerC DamReduceC MaxHPPerC DefPerC LuckyHitRateC PetDamPerC PerLVAtkC MissRateC HitRateC DamBackPerC PerLVMaxHPC DropEquipPerC DropMoneyPerC IgnoreDefRateReduceC DamChanceDefC SuperHitReduceC SkillAtkRateC SpeedPerC AtkSpeedC SkillAtkRateReduceC HitC MissC
-0 3 0 43637 32728 72001 18000 48532 44120 4603 13091 4115 750 37 345 19854 37 0 0 23564 9706 5823 19636 17673 43637 38826 800 800
+0 3 0 43637 32728 72001 18000 202207 44120 4603 13091 4115 750 37 345 19854 37 0 0 23564 9706 5823 19636 17673 43637 38826 800 800
1 1 0 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1300
1 2 0 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1300
1 2 1 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1300
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 90d7fe5..f66217b 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -185,15 +185,32 @@
905 30 0 4739 1 1 [] 0 7 0 0 1 0 27 2000 0 0
906 30 0 4737 1 1 [] 0 7 0 0 1 0 27 3000 0 0
909 30 0 4675 1 1 [] 0 7 0 0 1 0 27 5000 0 0
-1001 38 2 4185 1 1 [] 4185 0 0 0 1 5 1 288 800 0 FlashRushToBuy2 FlashToSnapUp
-1002 38 2 2343 1 1 [] 0 0 0 0 1 10 1 88 380 0 FlashRushToBuy2 FlashToSnapUp
-1003 38 2 2344 1 1 [] 2344 0 0 0 1 15 1 288 1000 0 FlashRushToBuy2 FlashToSnapUp
-1004 38 2 800 1 1 [] 800 0 0 0 1 20 1 88 240 0 FlashRushToBuy2 FlashToSnapUp
-1005 38 2 2213 20 1 [] 0 0 0 0 1 25 1 88 250 0 FlashRushToBuy2 FlashToSnapUp
-1006 39 2 4151 30 1 [] 3 0 0 0 1 30 1 88 300 0 FlashRushToBuy2 FlashToSnapUp
-1007 39 2 4151 70 1 [] 5 0 0 0 1 35 1 288 700 0 FlashRushToBuy2 FlashToSnapUp
-1008 39 2 181 30 1 [] 3514 0 0 0 1 40 1 88 300 0 FlashRushToBuy2 FlashToSnapUp
-1009 39 2 181 70 1 [] 3514 0 0 0 1 45 1 288 700 0 FlashRushToBuy2 FlashToSnapUp
-1010 39 2 851 1 1 [] 851 0 0 0 1 50 1 99 300 0 FlashRushToBuy2 FlashToSnapUp
-1011 39 2 854 1 1 [] 854 0 0 0 1 55 1 299 600 0 FlashRushToBuy2 FlashToSnapUp
-1012 39 2 2213 25 1 [] 0 0 0 0 1 60 1 188 625 0 FlashRushToBuy2 FlashToSnapUp
+1001 200 2 4606 3 1 [] 4606 0 0 0 1 1 1 999 3000 0 FlashRushToBuy2 FlashToSnapUp
+1002 200 2 4606 1 1 [] 4606 0 0 0 1 5 1 300 1000 0 FlashRushToBuy2 FlashToSnapUp
+1003 200 2 2213 50 1 [] 2213 0 0 0 1 20 1 150 625 0 FlashRushToBuy2 FlashToSnapUp
+1004 200 2 1503 2 1 [] 1503 0 0 0 1 50 1 20 100 0 FlashRushToBuy2 FlashToSnapUp
+1005 200 2 4007 3 1 [] 4007 0 0 0 1 0 1 60 240 0 FlashRushToBuy2 FlashToSnapUp
+1006 200 2 4622 5 1 [] 4622 0 0 0 1 0 1 88 400 0 FlashRushToBuy2 FlashToSnapUp
+1007 201 2 3516 2 1 [] 3516 0 0 0 1 1 1 999 4860 0 FlashRushToBuy2 FlashToSnapUp
+1008 201 2 947 1 1 [] 947 0 0 0 1 2 1 300 1000 0 FlashRushToBuy2 FlashToSnapUp
+1009 201 2 2050 6 1 [] 2050 0 0 0 1 5 1 50 300 0 FlashRushToBuy2 FlashToSnapUp
+1010 201 2 953 2 1 [] 953 0 0 0 1 10 1 88 500 0 FlashRushToBuy2 FlashToSnapUp
+1011 201 2 4681 1 1 [] 4681 0 0 0 1 10 1 50 250 0 FlashRushToBuy2 FlashToSnapUp
+1012 201 2 4184 1 1 [] 4184 0 0 0 1 20 1 58 230 0 FlashRushToBuy2 FlashToSnapUp
+1013 201 2 4010 4 1 [] 4010 0 0 0 1 0 1 100 320 0 FlashRushToBuy2 FlashToSnapUp
+1014 201 2 4609 2 1 [] 4609 0 0 0 1 0 1 50 200 0 FlashRushToBuy2 FlashToSnapUp
+1015 202 2 4607 2 1 [] 4607 0 0 0 1 2 1 999 4000 0 FlashRushToBuy2 FlashToSnapUp
+1016 202 2 7002 1 0 [] 7002 0 0 0 1 3 1 680 1800 0 FlashRushToBuy2 FlashToSnapUp
+1017 202 2 5206 1 1 [] 5206 0 0 0 1 3 1 100 250 0 FlashRushToBuy2 FlashToSnapUp
+1018 202 2 196 1 1 [] 196 0 0 0 1 5 1 200 800 0 FlashRushToBuy2 FlashToSnapUp
+1019 202 2 195 3 1 [] 195 0 0 0 1 10 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp
+1020 202 2 4610 1 1 [] 4610 0 0 0 1 0 1 60 200 0 FlashRushToBuy2 FlashToSnapUp
+1021 202 2 5410 3 1 [] 5410 0 0 0 1 0 1 88 150 0 FlashRushToBuy2 FlashToSnapUp
+1022 203 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp
+1023 203 2 5206 2 1 [] 5206 0 0 0 1 1 1 300 500 0 FlashRushToBuy2 FlashToSnapUp
+1024 203 2 2390 5 1 [] 2390 0 0 0 1 1 1 1800 3000 0 FlashRushToBuy2 FlashToSnapUp
+1025 203 2 4680 1 1 [] 4680 0 0 0 1 20 1 200 750 0 FlashRushToBuy2 FlashToSnapUp
+1026 203 2 2390 1 1 [] 2390 0 0 0 1 5 1 300 600 0 FlashRushToBuy2 FlashToSnapUp
+1027 203 2 2213 100 1 [] 2213 0 0 0 1 10 1 500 1250 0 FlashRushToBuy2 FlashToSnapUp
+1028 203 2 4608 2 1 [] 4608 0 0 0 1 0 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp
+1029 203 2 198 3 1 [] 198 0 0 0 1 0 1 88 900 0 FlashRushToBuy2 FlashToSnapUp
--
Gitblit v1.8.0