From f6089451b06a1abffb6db66dd02c5aaf839378ea Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 30 十二月 2025 20:44:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt | 6 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 8 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 8 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt | 33 ++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt | 38 +++++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt | 38 +++++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6034.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt | 33 ++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6035.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt | 6 +-
13 files changed, 86 insertions(+), 84 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index d6c6adb..e9f5875 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6034.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6034.pyc
new file mode 100644
index 0000000..5ffcea9
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6034.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6035.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6035.pyc
new file mode 100644
index 0000000..16e6be5
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6035.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
index 9ebc25a..555b82b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 4eb5eb2..65b5906 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
index 0de0213..cb1cc6a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
@@ -45,23 +45,18 @@
217 1 0 0 0 0 99 19800 0 1980 [] {} 17
218 1 0 0 0 0 99 32800 0 3280 [] {} 17
219 1 0 0 0 0 99 64800 0 6480 [] {} 17
-220 0 0 1 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 0
-221 0 0 1 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0],[4,20,0]] {} 0
-222 0 0 1 0 0 0 0 0 0 [[1,180,0],[2,30000,0],[3,300,0],[4,30,0]] {} 0
+220 0 0 1 0 0 0 0 0 0 [[1,60],[4,15],[10,6],[202,10]] {} 0
+221 0 0 1 0 0 0 0 0 0 [[1,120],[4,25],[10,10],[202,20]] {} 0
+222 0 0 1 0 0 0 0 0 0 [[1,180],[4,40],[10,16],[202,30]] {} 0
223 0 0 1 0 0 0 0 0 0 [[22,10,0]] {} 0
-224 0 0 1 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-225 0 0 2 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-226 0 0 3 0 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 20
-227 0 0 4 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-228 0 0 5 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-229 0 0 6 0 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 20
-230 0 0 7 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-231 0 0 8 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-232 0 0 0 1 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-233 0 0 0 2 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 21
-234 0 0 0 3 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 21
-235 0 0 0 4 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-236 0 0 0 5 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 21
-237 0 0 0 6 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 21
-238 0 0 0 7 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-239 0 0 0 8 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
+224 0 0 1 0 0 0 0 0 0 [[1,60],[3,100],[4,8]] {} 20
+225 0 0 1 0 0 0 0 0 0 [[1,120],[3,140],[5,3]] {} 20
+226 0 0 1 0 0 0 0 0 0 [[1,180],[3,180],[12,100]] {} 20
+227 0 0 1 0 0 0 0 0 0 [[1,120],[5,10],[200,60]] {} 20
+228 0 0 3 0 0 0 0 0 0 [[1,680],[14,50],[200,110]] {} 20
+229 0 0 1 0 0 0 0 0 0 [[1,1980],[8,450],[7,50000]] {} 20
+230 0 0 3 0 0 0 0 0 0 [[1,3280],[10,180],[7,60000]] {} 20
+232 0 0 0 3 0 0 0 0 0 [[1,680],[4,160],[2,60000]] {} 21
+233 0 0 0 1 0 0 0 0 0 [[1,1980],[13,60],[12,300],[200,110]] {} 21
+234 0 0 0 3 0 0 0 0 0 [[1,3280],[5,82],[25,1],[201,100]] {} 21
+235 0 0 0 3 0 0 0 0 0 [[1,6480],[5,165],[26,1],[202,100]] {} 21
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
index 543b493..f1b8cee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
@@ -35,7 +35,7 @@
35 0 0 1120
36 0 0 1490
37 0 0 1260 [[1, 20]]
-38 156 0 0 13
+38 156 0 0 13 [[1, 20]]
39 0 0 1710 [[1, 20]]
40 0 0 1350
41 0 0 1770
@@ -46,7 +46,7 @@
46 0 0 1490 2
47 0 0 1450 1
48 0 0 1040 0
-49 0 0 1040 0
+49 0 0 3000 28
50 0 0 2460 0
-51 0 0 1040 0
+51 0 0 0 0 20400
52 5 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
index 46b21a2..f4de928 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
@@ -49,6 +49,17 @@
cw.tehui.2 xssg 12 221 0 120 12
cw.tehui.3 xssg 18 222 0 180 18
cw.tehuiall xssg 30 223 0 300 30
+cw.daily.1 xssg 6 220 0 60 6
+cw.daily.2 xssg 12 221 0 120 12
+cw.daily.3 xssg 18 222 0 180 18
+cw.daily.4 xssg 30 223 0 300 30
+cw.daily.5 xssg 68 223 0 680 68
+cw.daily.6 xssg 198 223 0 1980 198
+cw.daily.7 xssg 328 223 0 3280 328
+cw.weekly.2 xssg 68 222 0 680 68
+cw.weekly.3 xssg 198 222 0 1980 198
+cw.weekly.4 xssg 328 222 0 3280 328
+cw.weekly.5 xssg 648 222 0 6480 648
test.sc.1 test 6 11 0 60 6
test.sc.2 test 18 12 0 180 18
test.sc.3 test 30 13 0 300 30
@@ -99,19 +110,14 @@
test.tehui.2 test 12 221 0 120 12
test.tehui.3 test 18 222 0 180 18
test.tehuiall test 30 223 0 300 30
-test.tehui.gift1 test 6 224 1 60 6
-test.tehui.gift2 test 12 225 2 120 12
-test.tehui.gift3 test 30 226 3 300 30
-test.tehui.gift4 test 30 227 4 300 30
-test.tehui.gift5 test 68 228 5 680 68
-test.tehui.gift6 test 198 229 6 1980 198
-test.tehui.gift7 test 6 230 7 60 6
-test.tehui.gift8 test 12 231 8 120 12
-test.tehui.gift9 test 30 232 9 300 30
-test.tehui.gift10 test 30 233 10 300 30
-test.tehui.gift11 test 68 234 11 680 68
-test.tehui.gift12 test 198 235 12 1980 198
-test.tehui.gift13 test 6 236 13 60 6
-test.tehui.gift14 test 12 237 14 120 12
-test.tehui.gift15 test 30 238 10 300 30
-test.tehui.gift16 test 68 239 11 680 68
+test.daily.1 test 6 224 0 60 6
+test.daily.2 test 12 225 0 120 12
+test.daily.3 test 18 226 0 180 18
+test.daily.4 test 30 227 0 300 30
+test.daily.5 test 68 228 0 680 68
+test.daily.6 test 198 229 0 1980 198
+test.daily.7 test 328 230 0 3280 328
+test.weekly.2 test 68 232 0 680 68
+test.weekly.3 test 198 233 0 1980 198
+test.weekly.4 test 328 234 0 3280 328
+test.weekly.5 test 648 235 0 6480 648
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index 1fc961a..88da356 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -678,10 +678,10 @@
4012050 4012050 1 1 同生共死 3 8 3 6 1 1500 0 10000 5507 0|540014|15 27 1 1 600000
4012070 4012070 1 1 乱世 3 10 1 6 0 10000 31 1000|1 5011 40 1 840000
4012080 4012080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 960000
-4012090 4012090 1 1 升变 3 0 1080000
-4012210 4012210 1 1 红颜枯骨·极 120000
-4012230 4012230 1 1 红颜枯骨·狂 360000
-4012240 4012240 1 1 神格 480000
+4012090 4012090 1 1 升变 3 5 5 0 10000 16 1000|1 5011 9 40120201 38 3 1 10 3 1080000
+4012210 4012210 1 1 红颜枯骨·极 6034 8 40120201 120000
+4012230 4012230 1 1 红颜枯骨·狂 6006 5500 8 4012020 360000
+4012240 4012240 1 1 神格 6035 1 8 40120201 480000
4013010 4013010 1 1 飞将遗戟 1 1 1 1 3 0 0 1 0 13500 0 0 10000 5010 40130101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
40130101 40130101 1 1 怒气 0 0 0 6 5 0 0 0 0 0 25 0 5000 0 42
4013020 4013020 1 1 温侯余烈 2 1 1 1 3 0 0 1 0 52000 0 0 10000 5010 40130201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
index 0de0213..cb1cc6a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
@@ -45,23 +45,18 @@
217 1 0 0 0 0 99 19800 0 1980 [] {} 17
218 1 0 0 0 0 99 32800 0 3280 [] {} 17
219 1 0 0 0 0 99 64800 0 6480 [] {} 17
-220 0 0 1 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 0
-221 0 0 1 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0],[4,20,0]] {} 0
-222 0 0 1 0 0 0 0 0 0 [[1,180,0],[2,30000,0],[3,300,0],[4,30,0]] {} 0
+220 0 0 1 0 0 0 0 0 0 [[1,60],[4,15],[10,6],[202,10]] {} 0
+221 0 0 1 0 0 0 0 0 0 [[1,120],[4,25],[10,10],[202,20]] {} 0
+222 0 0 1 0 0 0 0 0 0 [[1,180],[4,40],[10,16],[202,30]] {} 0
223 0 0 1 0 0 0 0 0 0 [[22,10,0]] {} 0
-224 0 0 1 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-225 0 0 2 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-226 0 0 3 0 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 20
-227 0 0 4 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-228 0 0 5 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-229 0 0 6 0 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 20
-230 0 0 7 0 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 20
-231 0 0 8 0 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 20
-232 0 0 0 1 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-233 0 0 0 2 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 21
-234 0 0 0 3 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 21
-235 0 0 0 4 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-236 0 0 0 5 0 0 0 0 0 [[1,60,0],[2,10000,0],[3,100,0],[4,10,0]] {} 21
-237 0 0 0 6 0 0 0 0 0 [[1,120,0],[2,20000,0],[3,200,0]] {} 21
-238 0 0 0 7 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
-239 0 0 0 8 0 0 0 0 0 [[1,180,0],[2,30000,0]] {} 21
+224 0 0 1 0 0 0 0 0 0 [[1,60],[3,100],[4,8]] {} 20
+225 0 0 1 0 0 0 0 0 0 [[1,120],[3,140],[5,3]] {} 20
+226 0 0 1 0 0 0 0 0 0 [[1,180],[3,180],[12,100]] {} 20
+227 0 0 1 0 0 0 0 0 0 [[1,120],[5,10],[200,60]] {} 20
+228 0 0 3 0 0 0 0 0 0 [[1,680],[14,50],[200,110]] {} 20
+229 0 0 1 0 0 0 0 0 0 [[1,1980],[8,450],[7,50000]] {} 20
+230 0 0 3 0 0 0 0 0 0 [[1,3280],[10,180],[7,60000]] {} 20
+232 0 0 0 3 0 0 0 0 0 [[1,680],[4,160],[2,60000]] {} 21
+233 0 0 0 1 0 0 0 0 0 [[1,1980],[13,60],[12,300],[200,110]] {} 21
+234 0 0 0 3 0 0 0 0 0 [[1,3280],[5,82],[25,1],[201,100]] {} 21
+235 0 0 0 3 0 0 0 0 0 [[1,6480],[5,165],[26,1],[202,100]] {} 21
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
index 543b493..f1b8cee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
@@ -35,7 +35,7 @@
35 0 0 1120
36 0 0 1490
37 0 0 1260 [[1, 20]]
-38 156 0 0 13
+38 156 0 0 13 [[1, 20]]
39 0 0 1710 [[1, 20]]
40 0 0 1350
41 0 0 1770
@@ -46,7 +46,7 @@
46 0 0 1490 2
47 0 0 1450 1
48 0 0 1040 0
-49 0 0 1040 0
+49 0 0 3000 28
50 0 0 2460 0
-51 0 0 1040 0
+51 0 0 0 0 20400
52 5 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
index 46b21a2..f4de928 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
@@ -49,6 +49,17 @@
cw.tehui.2 xssg 12 221 0 120 12
cw.tehui.3 xssg 18 222 0 180 18
cw.tehuiall xssg 30 223 0 300 30
+cw.daily.1 xssg 6 220 0 60 6
+cw.daily.2 xssg 12 221 0 120 12
+cw.daily.3 xssg 18 222 0 180 18
+cw.daily.4 xssg 30 223 0 300 30
+cw.daily.5 xssg 68 223 0 680 68
+cw.daily.6 xssg 198 223 0 1980 198
+cw.daily.7 xssg 328 223 0 3280 328
+cw.weekly.2 xssg 68 222 0 680 68
+cw.weekly.3 xssg 198 222 0 1980 198
+cw.weekly.4 xssg 328 222 0 3280 328
+cw.weekly.5 xssg 648 222 0 6480 648
test.sc.1 test 6 11 0 60 6
test.sc.2 test 18 12 0 180 18
test.sc.3 test 30 13 0 300 30
@@ -99,19 +110,14 @@
test.tehui.2 test 12 221 0 120 12
test.tehui.3 test 18 222 0 180 18
test.tehuiall test 30 223 0 300 30
-test.tehui.gift1 test 6 224 1 60 6
-test.tehui.gift2 test 12 225 2 120 12
-test.tehui.gift3 test 30 226 3 300 30
-test.tehui.gift4 test 30 227 4 300 30
-test.tehui.gift5 test 68 228 5 680 68
-test.tehui.gift6 test 198 229 6 1980 198
-test.tehui.gift7 test 6 230 7 60 6
-test.tehui.gift8 test 12 231 8 120 12
-test.tehui.gift9 test 30 232 9 300 30
-test.tehui.gift10 test 30 233 10 300 30
-test.tehui.gift11 test 68 234 11 680 68
-test.tehui.gift12 test 198 235 12 1980 198
-test.tehui.gift13 test 6 236 13 60 6
-test.tehui.gift14 test 12 237 14 120 12
-test.tehui.gift15 test 30 238 10 300 30
-test.tehui.gift16 test 68 239 11 680 68
+test.daily.1 test 6 224 0 60 6
+test.daily.2 test 12 225 0 120 12
+test.daily.3 test 18 226 0 180 18
+test.daily.4 test 30 227 0 300 30
+test.daily.5 test 68 228 0 680 68
+test.daily.6 test 198 229 0 1980 198
+test.daily.7 test 328 230 0 3280 328
+test.weekly.2 test 68 232 0 680 68
+test.weekly.3 test 198 233 0 1980 198
+test.weekly.4 test 328 234 0 3280 328
+test.weekly.5 test 648 235 0 6480 648
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index 1fc961a..88da356 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -678,10 +678,10 @@
4012050 4012050 1 1 同生共死 3 8 3 6 1 1500 0 10000 5507 0|540014|15 27 1 1 600000
4012070 4012070 1 1 乱世 3 10 1 6 0 10000 31 1000|1 5011 40 1 840000
4012080 4012080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 960000
-4012090 4012090 1 1 升变 3 0 1080000
-4012210 4012210 1 1 红颜枯骨·极 120000
-4012230 4012230 1 1 红颜枯骨·狂 360000
-4012240 4012240 1 1 神格 480000
+4012090 4012090 1 1 升变 3 5 5 0 10000 16 1000|1 5011 9 40120201 38 3 1 10 3 1080000
+4012210 4012210 1 1 红颜枯骨·极 6034 8 40120201 120000
+4012230 4012230 1 1 红颜枯骨·狂 6006 5500 8 4012020 360000
+4012240 4012240 1 1 神格 6035 1 8 40120201 480000
4013010 4013010 1 1 飞将遗戟 1 1 1 1 3 0 0 1 0 13500 0 0 10000 5010 40130101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
40130101 40130101 1 1 怒气 0 0 0 6 5 0 0 0 0 0 25 0 5000 0 42
4013020 4013020 1 1 温侯余烈 2 1 1 1 3 0 0 1 0 52000 0 0 10000 5010 40130201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
--
Gitblit v1.8.0