From 23fcce49313d4ad554b4e24c6db812fbc1c6cf71 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 24 十一月 2025 14:45:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt  |    1 -
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt  |    1 -
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc               |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |    2 +-
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
index e5aebd0..f879260 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index 58046f3..e7bc857 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -431,7 +431,7 @@
 InvestCost	{"1":[116],"2":[117]} 				
 InvestDay	{"1":30}	{"1":180}	{"1":[[4,10],[3,100]], "2":[[1,100], [3,100]]} 		
 InvestPower	{"1":{"30010":2}}	{"2":[30010]}	{"1":3, "2":3}	{"2":3}	
-AutoGuaji	[1,8,12,16,20]	1260		[1.4,1.8,2.2]	
+AutoGuaji	[1,4,8,12,16]	1260		[1.4,1.8,2.2]	
 GoldRush	12|12	60|60	10		
 GoldRushAuto	[3,  30]	[[1]]	[1,2,3,4]		
 GoldRushRefresh	1	42	[10,20,30,40,50]	30	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
index 9ed4492..fdb0941 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
@@ -3,4 +3,3 @@
 1	0	1	0	0	0	0			
 2	0	1	3	0	0	0			
 3	0	1	5	0	0	0			
-999	0	2	4	1	1	5	71|72	500|500	100|100
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 58046f3..e7bc857 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
@@ -431,7 +431,7 @@
 InvestCost	{"1":[116],"2":[117]} 				
 InvestDay	{"1":30}	{"1":180}	{"1":[[4,10],[3,100]], "2":[[1,100], [3,100]]} 		
 InvestPower	{"1":{"30010":2}}	{"2":[30010]}	{"1":3, "2":3}	{"2":3}	
-AutoGuaji	[1,8,12,16,20]	1260		[1.4,1.8,2.2]	
+AutoGuaji	[1,4,8,12,16]	1260		[1.4,1.8,2.2]	
 GoldRush	12|12	60|60	10		
 GoldRushAuto	[3,  30]	[[1]]	[1,2,3,4]		
 GoldRushRefresh	1	42	[10,20,30,40,50]	30	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
index 9ed4492..fdb0941 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
@@ -3,4 +3,3 @@
 1	0	1	0	0	0	0			
 2	0	1	3	0	0	0			
 3	0	1	5	0	0	0			
-999	0	2	4	1	1	5	71|72	500|500	100|100

--
Gitblit v1.8.0