~admin/snxx_server.git

parent: a899dc4b | 补丁 | 提交 | ignore whitespace

Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

cehua-TT

2018-09-10 613648692ea844ae5e70b2abadebe7eea3988d31

Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

7个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Robot/AI/AIFile/AILoginout.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagSuccess.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt

@@ -1,5 +1,5 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    LimitLV    IsDayReset    TemplateIDList

1    test1    [7001]    2018-9-10    2018-9-11    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

2    test2    [7002]    2018-9-11    2018-9-12    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

3    test3    [7003]    2018-9-12    2018-9-13    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

4    NationalDay1    [24]    2018-7-16    2018-7-17    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    1    1

3    test3    [7003]    2018-9-15    2018-9-16    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

4    test4    [24]    2018-9-13    2018-9-14    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1


 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -40,7 +40,7 @@
OpenJob    1|2    0    0    0    0

TeamReadyTime    30                

BossShunt    10040|21070    1    5        

MapLine    10040_10|10080_5|21070_1    10010_11|10020_11|10030_11|10080_6|10040_51    [10103001,10203001,10303001,10403001]		
MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]		
DropRecordValue    4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078                

DropRecordNum    40    1            

KillBossCntLimit    {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}    0_3|1_0|2_3    {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'}    {1:27}    {0:[21,'WorldBossNoHarm']}


 Robot/AI/AIFile/AILoginout.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt

@@ -1,18 +1,18 @@
Map001_Sjz    10010    神诀宗    10010    0    0    0    11    1

Map002_Yg    10020    影谷    10020    0    0    0    11    1

Map003_Yjsz    10030    御剑山庄    10030    0    0    0    11    1

Map004_Xyc    10040    逍遥城    10040    0    0    0    51    1

Map005_Bfhl    10050    冰封回廊    10050    0    0    0    5    1

Map006_Mld    10060    秘灵岛    10060    0    0    0    5    1

Map007_Jyzk    10070    极炎之窟    10070    0    0    0    5    1

Map008_Xmhj    10080    玄梦幻界    10080    0    0    0    6    1

Map009_Lysj    10090    两仪山间    10090    0    0    0    5    1

Map011_Hgdg    10110    恒古地宫    10110    0    0    0    5    1

Map004_Xyc    10040    逍遥城    10040    0    0    0    26    1

Map005_Bfhl    10050    冰封回廊    10050    0    0    0    10    1

Map006_Mld    10060    秘灵岛    10060    0    0    0    10    1

Map007_Jyzk    10070    极炎之窟    10070    0    0    0    10    1

Map008_Xmhj    10080    玄梦幻界    10080    0    0    0    11    1

Map009_Lysj    10090    两仪山间    10090    0    0    0    10    1

Map011_Hgdg    10110    恒古地宫    10110    0    0    0    10    1

Map101_Dtzz    31010    仙魔之争    31010    0    0    0    100    1

Map102_Bzjyc    31020    boss之家一层    31020    0    0    0    1    1

Map103_Bzjec    31030    boss之家二层    31030    0    0    0    1    1

Map104_Ljzs    31040    日常副本    31040    0    0    0    100    1

Map107_Shgm    21070    深海古墓    21070    0    0    0    50    1

Map107_Shgm    21070    深海古墓    21070    0    0    0    25    1

Map108_Xjmj    31080    仙界秘境    31080    0    0    0    100    1

Map127_JjfbA    31110    渡劫    31110    0    0    0    100    1

Map110_Hwsm    21100    荒芜沙漠    21100    0    0    0    1    1


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -203,7 +203,7 @@
AngryAdd    60    1    20    100    0

BossHomeCost    1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200    0    0    0    0

BossShunt    10040|21070    1    5        

MapLine    10040_10|10080_5|21070_1    10010_11|10020_11|10030_11|10080_6|10040_51    [10103001,10203001,10303001,10403001]		
MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]		
DungeonDeliver    31020|31030|31150                

DungeonIntegral    10000                

BuyFBCntCost    {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}                


 db/PyMongoDataServer/PySysDB/tagSuccess.txt

@@ -79,7 +79,7 @@
368    42    1    304    0        2_10    0        0    107    10

369    39    3    4|4    0        2_10    0        0    107    10

370    46    4    0    0        2_10    0        0    107    10

371    28    1    0    0        2_20    0        0    107    10

371    28    1    0    0        2_10    0        0    107    10

401    26    160    0    0        2_10    0        0    108    10

402    48    18    0    0        2_10    0        0    108    10

403    48    21    0    0        2_10    0        0    108    10

@@ -104,7 +104,7 @@
436    7    8    0    0        2_10    0        0    108    10

437    39    5    4|4    0        2_10    0        0    108    10

438    128    2    0    0        2_10    0        0    108    10

439    28    2    0    0        2_20    0        0    108    10

439    28    2    0    0        2_10    0        0    108    10

441    33    1    307|0    0        2_10    0        0    0    0

442    91    5    1005|2005|3005    0        2_10    0        0    108    10

443    91    5    50205|55205|60205    0        2_10    0        0    108    10

@@ -135,7 +135,7 @@
475    128    4    0    0        2_10    0        0    108    10

476    128    6    0    0        2_10    0        0    108    10

477    91    5    50505|55505|60505    0        2_10    0        0    108    10

478    28    4    0    0        2_20    0        0    108    10

478    28    4    0    0        2_10    0        0    108    10

501    116    20    5012|5022    0        2_10    0        0    109    10

502    26    220    0    0        2_10    0        0    109    10

503    91    5    50605|55605|60605    0        2_10    0        0    109    10

@@ -160,7 +160,7 @@
535    26    240    0    0        2_10    0        0    109    10

536    26    260    0    0        2_10    0        0    109    10

537    33    1    308|0    0        2_10    0        0    109    10

538    28    6    0    0        2_20    0        0    109    10

538    28    6    0    0        2_10    0        0    109    10

541    50    10    0    0        2_10    0        0    109    10

542    26    280    0    0        2_10    0        0    109    10

543    36    1    60203011    0        2_10    0        0    109    10

@@ -179,8 +179,8 @@
568    26    300    0    0        2_10    0        0    109    10

569    124    1    1|5|2    0        2_10    0        0    109    10

570    92    2    1|2|1    0        2_10    0        0    109    10

571    28    8    0    0        2_20    0        0    109    10

572    28    10    0    0        2_20    0        0    109    10

571    28    8    0    0        2_10    0        0    109    10

572    28    10    0    0        2_10    0        0    109    10

601    69    1    4004    0        2_10    0        0    110    10

602    125    2    0    0        2_10    0        0    110    10

603    91    5    50705|55705|60705    0        2_10    0        0    110    10

			@@ -1,5 +1,5 @@
			CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd LimitLV IsDayReset TemplateIDList
			1 test1 [7001] 2018-9-10 2018-9-11 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
			2 test2 [7002] 2018-9-11 2018-9-12 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
			3 test3 [7003] 2018-9-12 2018-9-13 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
			4 NationalDay1 [24] 2018-7-16 2018-7-17 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 1 1
			3 test3 [7003] 2018-9-15 2018-9-16 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
			4 test4 [24] 2018-9-13 2018-9-14 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1

			@@ -40,7 +40,7 @@
			OpenJob 1\|2 0 0 0 0
			TeamReadyTime 30
			BossShunt 10040\|21070 1 5
			MapLine 10040_10\|10080_5\|21070_1 10010_11\|10020_11\|10030_11\|10080_6\|10040_51 [10103001,10203001,10303001,10403001]
			MapLine 10040_10\|10080_10\|21070_1 10010_11\|10020_11\|10030_11\|10080_11\|10040_26 [10103001,10203001,10303001,10403001]
			DropRecordValue 4213\|250\|4202\|3802\|983\|982\|260\|4209\|3803\|258\|4210\|3804\|9051\|9062\|3805\|3806\|9073\|222\|4250\|260\|4209\|9074\|9075\|9077\|9078
			DropRecordNum 40 1
			KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3\|1_0\|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}

			@@ -1,18 +1,18 @@
			Map001_Sjz 10010 神诀宗 10010 0 0 0 11 1
			Map002_Yg 10020 影谷 10020 0 0 0 11 1
			Map003_Yjsz 10030 御剑山庄 10030 0 0 0 11 1
			Map004_Xyc 10040 逍遥城 10040 0 0 0 51 1
			Map005_Bfhl 10050 冰封回廊 10050 0 0 0 5 1
			Map006_Mld 10060 秘灵岛 10060 0 0 0 5 1
			Map007_Jyzk 10070 极炎之窟 10070 0 0 0 5 1
			Map008_Xmhj 10080 玄梦幻界 10080 0 0 0 6 1
			Map009_Lysj 10090 两仪山间 10090 0 0 0 5 1
			Map011_Hgdg 10110 恒古地宫 10110 0 0 0 5 1
			Map004_Xyc 10040 逍遥城 10040 0 0 0 26 1
			Map005_Bfhl 10050 冰封回廊 10050 0 0 0 10 1
			Map006_Mld 10060 秘灵岛 10060 0 0 0 10 1
			Map007_Jyzk 10070 极炎之窟 10070 0 0 0 10 1
			Map008_Xmhj 10080 玄梦幻界 10080 0 0 0 11 1
			Map009_Lysj 10090 两仪山间 10090 0 0 0 10 1
			Map011_Hgdg 10110 恒古地宫 10110 0 0 0 10 1
			Map101_Dtzz 31010 仙魔之争 31010 0 0 0 100 1
			Map102_Bzjyc 31020 boss之家一层 31020 0 0 0 1 1
			Map103_Bzjec 31030 boss之家二层 31030 0 0 0 1 1
			Map104_Ljzs 31040 日常副本 31040 0 0 0 100 1
			Map107_Shgm 21070 深海古墓 21070 0 0 0 50 1
			Map107_Shgm 21070 深海古墓 21070 0 0 0 25 1
			Map108_Xjmj 31080 仙界秘境 31080 0 0 0 100 1
			Map127_JjfbA 31110 渡劫 31110 0 0 0 100 1
			Map110_Hwsm 21100 荒芜沙漠 21100 0 0 0 1 1

			@@ -203,7 +203,7 @@
			AngryAdd 60 1 20 100 0
			BossHomeCost 1_0\|2_100\|3_200\|4_200\|5_200\|6_200\|7_200\|8_200 0 0 0 0
			BossShunt 10040\|21070 1 5
			MapLine 10040_10\|10080_5\|21070_1 10010_11\|10020_11\|10030_11\|10080_6\|10040_51 [10103001,10203001,10303001,10403001]
			MapLine 10040_10\|10080_10\|21070_1 10010_11\|10020_11\|10030_11\|10080_11\|10040_26 [10103001,10203001,10303001,10403001]
			DungeonDeliver 31020\|31030\|31150
			DungeonIntegral 10000
			BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)10+min(max(hasBuyCnt-3,0),1)10+min(max(hasBuyCnt-5,0),1)10+min(max(hasBuyCnt-7,0),1)10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}

			@@ -79,7 +79,7 @@
			368 42 1 304 0 2_10 0 0 107 10
			369 39 3 4\|4 0 2_10 0 0 107 10
			370 46 4 0 0 2_10 0 0 107 10
			371 28 1 0 0 2_20 0 0 107 10
			371 28 1 0 0 2_10 0 0 107 10
			401 26 160 0 0 2_10 0 0 108 10
			402 48 18 0 0 2_10 0 0 108 10
			403 48 21 0 0 2_10 0 0 108 10
			@@ -104,7 +104,7 @@
			436 7 8 0 0 2_10 0 0 108 10
			437 39 5 4\|4 0 2_10 0 0 108 10
			438 128 2 0 0 2_10 0 0 108 10
			439 28 2 0 0 2_20 0 0 108 10
			439 28 2 0 0 2_10 0 0 108 10
			441 33 1 307\|0 0 2_10 0 0 0 0
			442 91 5 1005\|2005\|3005 0 2_10 0 0 108 10
			443 91 5 50205\|55205\|60205 0 2_10 0 0 108 10
			@@ -135,7 +135,7 @@
			475 128 4 0 0 2_10 0 0 108 10
			476 128 6 0 0 2_10 0 0 108 10
			477 91 5 50505\|55505\|60505 0 2_10 0 0 108 10
			478 28 4 0 0 2_20 0 0 108 10
			478 28 4 0 0 2_10 0 0 108 10
			501 116 20 5012\|5022 0 2_10 0 0 109 10
			502 26 220 0 0 2_10 0 0 109 10
			503 91 5 50605\|55605\|60605 0 2_10 0 0 109 10
			@@ -160,7 +160,7 @@
			535 26 240 0 0 2_10 0 0 109 10
			536 26 260 0 0 2_10 0 0 109 10
			537 33 1 308\|0 0 2_10 0 0 109 10
			538 28 6 0 0 2_20 0 0 109 10
			538 28 6 0 0 2_10 0 0 109 10
			541 50 10 0 0 2_10 0 0 109 10
			542 26 280 0 0 2_10 0 0 109 10
			543 36 1 60203011 0 2_10 0 0 109 10
			@@ -179,8 +179,8 @@
			568 26 300 0 0 2_10 0 0 109 10
			569 124 1 1\|5\|2 0 2_10 0 0 109 10
			570 92 2 1\|2\|1 0 2_10 0 0 109 10
			571 28 8 0 0 2_20 0 0 109 10
			572 28 10 0 0 2_20 0 0 109 10
			571 28 8 0 0 2_10 0 0 109 10
			572 28 10 0 0 2_10 0 0 109 10
			601 69 1 4004 0 2_10 0 0 110 10
			602 125 2 0 0 2_10 0 0 110 10
			603 91 5 50705\|55705\|60705 0 2_10 0 0 110 10