~admin/snxx_server.git

parent: 2e79737e | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_wcy

2018-09-14 b3e5547cb34c043dde0d2d279badfa40a12de7f7

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

10个文件已修改

	CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFbEncourage.txt	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagOrderInfo.txt	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc

Binary files differ

 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFbEncourage.txt

@@ -1,5 +1,4 @@
DataMapId    InspireType    InspireCount    MoneyCount

31080    1    5    1000

31080    2    10    5

52010    1    5    1000

52010    2    10    2

31080    3    5    1000

31080    5    10    5

52010    1    10    5*(encourageLV+1)


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -208,7 +208,7 @@
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","51010":"50"}                

FBEncourageBuff    {31080:20051,52010:20081}    {31080:10,52010:10}    31080_10|52010_20		
FBEncourageBuff    {31080:20051,52010:20081}    31080_10|52010_10    31080_10|52010_10		
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                

DropRecordEquipment    {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}                

DropRecordNormal    2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251                


 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt

@@ -121,3 +121,18 @@
sgsbl.ios.68    815035927    68    0    5

sgsbl.ios.128    815035927    128    0    7

sgsbl.ios.168    815035927    168    0    8

test.18    test    18    101    0

test.10    test    10    102    0

test.30    test    30    103    0

test.98    test    98    104    0

test.128    test    128    105    0

test.198    test    198    106    0

test.328    test    328    107    0

test.648    test    648    108    0

test.3000    test    3000    109    0

test.1    test    1    110    0

test.libao.6    test    6    0    2

test.libao.30    test    30    0    4

test.libao.68    test    68    0    5

test.libao.128    test    128    0    7

test.libao.168    test    168    0    8


 db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt

@@ -1,11 +1,11 @@
PrivilegeID    EffectValue    singleValue    maxValue    attr    itemAward    successList

1    0            {"6":10000,"7":200}        1061|1021|1041

2    0    3    180    {"7":50}        1063|1023|1043

3    0                    1062|1022|1042

4    10000                    1064|1024|1044

5    0    4    0    {"7":100}        1066|1026|1046

6    0    1    0    {"6":12000}        1065|1025|1045

7    0    5    450    {"26":200}        1068|1028|1048

8    0            {"86":5000}        1067|1027|1047

9    0            {"87":5000}        1069|1029|1049

10    0    0    0        [[5303,50,1]]    1070|1030|1050

1    0            {"6":10000,"7":200}        1061|1021

2    0    3    180    {"7":50}        1063|1023

3    0                    1062|1022

4    10000                    1064|1024

5    0    4    0    {"7":100}        1066|1026

6    0    1    0    {"6":12000}        1065|1025

7    0    5    450    {"26":200}        1068|1028

8    0            {"86":5000}        1067|1027

9    0            {"87":5000}        1069|1029

10    0    0    0        [[5303,50,1]]    1070|1030

			@@ -1,5 +1,4 @@
			DataMapId InspireType InspireCount MoneyCount
			31080 1 5 1000
			31080 2 10 5
			52010 1 5 1000
			52010 2 10 2
			31080 3 5 1000
			31080 5 10 5
			52010 1 10 5*(encourageLV+1)

			@@ -208,7 +208,7 @@
			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","51010":"50"}
			FBEncourageBuff {31080:20051,52010:20081} {31080:10,52010:10} 31080_10\|52010_20
			FBEncourageBuff {31080:20051,52010:20081} 31080_10\|52010_10 31080_10\|52010_10
			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
			DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
			DropRecordNormal 2320\|4606\|4607\|4608\|4609\|4610\|3801\|2339\|2340\|5302\|5206\|5207\|5202\|5006\|5007\|4182\|4253\|224\|4252\|222\|4250\|223\|4251

			@@ -121,3 +121,18 @@
			sgsbl.ios.68 815035927 68 0 5
			sgsbl.ios.128 815035927 128 0 7
			sgsbl.ios.168 815035927 168 0 8
			test.18 test 18 101 0
			test.10 test 10 102 0
			test.30 test 30 103 0
			test.98 test 98 104 0
			test.128 test 128 105 0
			test.198 test 198 106 0
			test.328 test 328 107 0
			test.648 test 648 108 0
			test.3000 test 3000 109 0
			test.1 test 1 110 0
			test.libao.6 test 6 0 2
			test.libao.30 test 30 0 4
			test.libao.68 test 68 0 5
			test.libao.128 test 128 0 7
			test.libao.168 test 168 0 8

			@@ -1,11 +1,11 @@
			PrivilegeID EffectValue singleValue maxValue attr itemAward successList
			1 0 {"6":10000,"7":200} 1061\|1021\|1041
			2 0 3 180 {"7":50} 1063\|1023\|1043
			3 0 1062\|1022\|1042
			4 10000 1064\|1024\|1044
			5 0 4 0 {"7":100} 1066\|1026\|1046
			6 0 1 0 {"6":12000} 1065\|1025\|1045
			7 0 5 450 {"26":200} 1068\|1028\|1048
			8 0 {"86":5000} 1067\|1027\|1047
			9 0 {"87":5000} 1069\|1029\|1049
			10 0 0 0 [[5303,50,1]] 1070\|1030\|1050
			1 0 {"6":10000,"7":200} 1061\|1021
			2 0 3 180 {"7":50} 1063\|1023
			3 0 1062\|1022
			4 10000 1064\|1024
			5 0 4 0 {"7":100} 1066\|1026
			6 0 1 0 {"6":12000} 1065\|1025
			7 0 5 450 {"26":200} 1068\|1028
			8 0 {"86":5000} 1067\|1027
			9 0 {"87":5000} 1069\|1029
			10 0 0 0 [[5303,50,1]] 1070\|1030