From 3681fb5f0cab3a8b6f3c79d1bad43ee4e46c9a6d Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 06 七月 2026 18:40:55 +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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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 322f430..0f19e61 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
@@ -442,7 +442,7 @@
 ArenaCross	12	{"4":1001, "8":1002}			
 TianziBillboradAward	{"1":[[1,300,0],[8,300,0],[7,20000,0]],"2":[[1,200,0],[8,200,0],[7,18000,0]],"3":[[1,100,0],[8,100,0],[7,16000,0]],"10":[[1,80,0],[8,80,0],[7,14000,0]],"50":[[1,50,0],[8,60,0],[7,12000,0]],"100":[[1,20,0],[8,40,0],[7,10000,0]],"500":[[1,10,0],[8,20,0],[7,8000,0]],"9999":[[1,5,0],[8,10,0],[7,5000,0]]}				
 SignInSet	1|30				
-Zhanling	{"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115], "7":[1000], "8":[1001], "9":[22001], "100":[22001], "101":[22003], "102":[22005], "103":[22007], "104":[22011], "105":[22013], "106":[22015], "107":[22017], "200":[22009]}	{"6":"ZhanlingRewardUnget", "100":"ZhanlingUnget", "101":"ZhanlingUnget", "102":"ZhanlingUnget", "103":"ZhanlingUnget", "104":"ZhanlingUnget", "105":"ZhanlingUnget", "106":"ZhanlingUnget", "107":"ZhanlingUnget"}	{"9":[22002], "100":[22002], "101":[22004], "102":[22006], "103":[22008],"104":[22012], "105":[22014], "106":[22016], "107":[22018],  "200":[22010]}	{}	[2,1,3,7,5,8,4]
+Zhanling	{"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115], "7":[1000], "8":[1001], "9":[30010], "100":[22001], "101":[22003], "102":[22005], "103":[22007], "104":[22011], "105":[22013], "106":[22015], "107":[22017], "200":[22009]}	{"6":"ZhanlingRewardUnget", "100":"ZhanlingUnget", "101":"ZhanlingUnget", "102":"ZhanlingUnget", "103":"ZhanlingUnget", "104":"ZhanlingUnget", "105":"ZhanlingUnget", "106":"ZhanlingUnget", "107":"ZhanlingUnget"}	{"9":[30011], "100":[22002], "101":[22004], "102":[22006], "103":[22008],"104":[22012], "105":[22014], "106":[22016], "107":[22018],  "200":[22010]}	{}	[2,1,3,7,5,8,4]
 Gubao	{"2":[10002, 1],"3":[10003, 1], "4":[10004, 1], "5":[10005, 1]}				
 LLMJ	2				
 StoreHeroSoul	12	43|100	1		
@@ -481,8 +481,8 @@
 FamilyGCZContributionHigh	25	5	[[500, [1,15]],[1000, [1,25]],[1500, [2,150]],[2000, [2,250]],[2000, [3,15]],[1000, [3,25]],[2000, [7,1500]]]		
 FamilyGCZGuess	[23,31]	10	3	[[1,50]]	
 FamilyGCZItem	202	[]			
-LianqiSet	200	65	{"2":[[1,5]],"3":[[2,5]],"4":[[1,5],[2,10]],"5":[[1,5],[3,10]],"6":[[1,10],[2,10]],"7":[[1,10],[2,50]],"8":[[1,20],[3,50]],"9":[[1,30],[2,100]],"10":[[1,40],[2,100],[3,20]],"11":[[1,50],[2,200],[3,40],[4,1]],"12":[[1,200],[2,100],[3,10],[4,1]],"13":[[1,300],[2,200],[3,10],[4,1]]}		
-LianqiUseItem	[46,47,48,49]	{"46":20, "47":20, "48":20, "49":999}	7	15	[36,37,38]
+LianqiSet	200	65	{"2":[[3,20]],"3":[[3,20]],"4":[[3,20],[1,20]],"5":[[3,20],[1,20]],"6":[[3,30],[1,20]],"7":[[3,30],[1,50]],"8":[[3,50],[1,50]],"9":[[3,50],[1,100]],"10":[[3,80],[1,100],[4,10]],"11":[[3,100],[1,200],[4,20],[1006,50]],"12":[[3,200],[4,50],[8,300],[9,15]],"13":[[3,400],[4,100],[8,300],[9,15]]}		
+LianqiUseItem	[46,47,48,49]	{"46":20, "47":20, "48":20, "49":999}	7	15	[46,47,48,49]
 LianqiRand	2	{(1,3):[[10000,1]],(4,5):[[8500,1],[10000,2]],(6,8):[[8500,1],[9700,2],[10000,3]],(9,9):[[8500,1],[9500,2],[9800,3],[10000,4]],(10,10):[[8500,1],[9500,2],[9700,3],[9850,4],[10000,5]],(11,13):[[8500,1],[9400,2],[9600,3],[9800,4],[10000,5]]}			
 BeastBattle	3				
 BeastSet	[20, 40, 60, 80]				

--
Gitblit v1.8.0