From 147a6919822818e5cedc61a5838b87308a6b677a Mon Sep 17 00:00:00 2001
From: CeHua_TRX <526616766@qq.com>
Date: 星期二, 11 十二月 2018 20:30:14 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 8 ++++----
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 58f1e36..d658715 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -60,7 +60,7 @@
59 December12 [] [] 2018-12-10 2018-12-10 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
60 December13 [] [] 2018-12-11 2018-12-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
61 December14 [] [] 2018-12-12 2018-12-12 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-58 December15 [] [] 2018-12-15 2018-12-15 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-59 December16 [] [] 2018-12-16 2018-12-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-60 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-61 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+62 December15 [] [] 2018-12-15 2018-12-15 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+63 December16 [] [] 2018-12-16 2018-12-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+64 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+65 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 1766b1b..dc33fdf 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -60,7 +60,7 @@
59 2018-12-10 2018-12-10 110 0 [[48]] SellMail4
60 2018-12-11 2018-12-11 110 0 [[49]] SellMail4
61 2018-12-12 2018-12-12 110 0 [[50]] SellMail4
-58 2018-12-15 2018-12-15 110 0 [[51]] SellMail4
-59 2018-12-16 2018-12-16 110 0 [[52]] SellMail4
-60 2018-12-17 2018-12-17 110 0 [[53]] SellMail4
-61 2018-12-18 2018-12-18 110 0 [[54]] SellMail4
+62 2018-12-15 2018-12-15 110 0 [[51]] SellMail4
+63 2018-12-16 2018-12-16 110 0 [[52]] SellMail4
+64 2018-12-17 2018-12-17 110 0 [[53]] SellMail4
+65 2018-12-18 2018-12-18 110 0 [[54]] SellMail4
--
Gitblit v1.8.0