From d1a5290bd94422107fba3a41e9c91649e8619371 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 23 十二月 2025 11:30:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index dec83cb..021882b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -416,7 +416,7 @@
 MainDropAppoint	{1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,1,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}				
 TreeLVUP	42	4|300			
 TreeEnergy	3	3	120	30	1|50
-TurnFightProcess	2				
+TurnFightProcess	2	0			
 TurnFightCD	0	800			
 TurnMax	15	15	{}		
 AngerXP	50	100	50	5	{"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}

--
Gitblit v1.8.0