Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
4ece82248c
|
|
@ -1197,3 +1197,53 @@ int
|
||||||
252023
|
252023
|
||||||
252024
|
252024
|
||||||
252025
|
252025
|
||||||
|
260001
|
||||||
|
260002
|
||||||
|
260003
|
||||||
|
260004
|
||||||
|
260005
|
||||||
|
260006
|
||||||
|
260007
|
||||||
|
260008
|
||||||
|
260009
|
||||||
|
260010
|
||||||
|
260011
|
||||||
|
260012
|
||||||
|
260013
|
||||||
|
260014
|
||||||
|
260015
|
||||||
|
260016
|
||||||
|
260017
|
||||||
|
260018
|
||||||
|
260019
|
||||||
|
260020
|
||||||
|
260021
|
||||||
|
260022
|
||||||
|
260023
|
||||||
|
260024
|
||||||
|
260025
|
||||||
|
260026
|
||||||
|
260027
|
||||||
|
260028
|
||||||
|
260029
|
||||||
|
260030
|
||||||
|
260031
|
||||||
|
260032
|
||||||
|
260033
|
||||||
|
260034
|
||||||
|
260035
|
||||||
|
260036
|
||||||
|
260037
|
||||||
|
260038
|
||||||
|
260039
|
||||||
|
260040
|
||||||
|
260041
|
||||||
|
260042
|
||||||
|
260043
|
||||||
|
260044
|
||||||
|
260045
|
||||||
|
260046
|
||||||
|
260047
|
||||||
|
260048
|
||||||
|
260049
|
||||||
|
260050
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ int mut,int#int,1
|
||||||
101061 10104
|
101061 10104
|
||||||
101062 10105
|
101062 10105
|
||||||
101063 101113
|
101063 101113
|
||||||
101064 101114#101115
|
101064 10102
|
||||||
102001 102001#102002
|
102001 102001#102002
|
||||||
102002 102003#102004
|
102002 102003#102004
|
||||||
102003 102005#102006
|
102003 102005#102006
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh InvasionBossPrivilege InvasionBossTimesAdd AdventureOffline AdventureFastBattle AdventureFastBattlePrivilege AdventureBaseRewardPrivilege AdventureMineralPrivilege AdventureRunePrivilege NatureName ItemCompoundLimit HeroCompoundLimit EquipCompoundLimit DailyGift RecoveryTime HeroTimes ReturnMaterials
|
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh InvasionBossPrivilege InvasionBossTimesAdd AdventureOffline AdventureFastBattle AdventureFastBattlePrivilege AdventureBaseRewardPrivilege AdventureMineralPrivilege AdventureRunePrivilege NatureName ItemCompoundLimit HeroCompoundLimit EquipCompoundLimit DailyGift RecoveryTime HeroTimes ReturnMaterials IncidentalBossSave
|
||||||
int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int int int int int int int int int string int int int mut,int#int,1 int int mut,int#int,2
|
int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int int int int int int int int int string int int int mut,int#int,1 int int mut,int#int,2 int
|
||||||
1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 999 1 08#19 60 9 1800 10 28800 4 1 2 3 99 20 20 27#7 3600 5 14#80
|
1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 999 1 08#19 60 9 1800 10 28800 4 1 2 3 99 20 20 27#7 3600 5 14#80 1800
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,7 @@ int string bool int int int bool int string int int int int mut,int#int,1 int in
|
||||||
1529 半卷藏宝图 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
1529 半卷藏宝图 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
||||||
1530 淡水 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
1530 淡水 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
||||||
1531 兽肉 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
1531 兽肉 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
||||||
|
1532 幻魂草 true 0 3 1 false 0 0 0 0 0 null 1 999999999
|
||||||
3001 止玄短杖-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
3001 止玄短杖-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
||||||
3002 千钧短杖-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
3002 千钧短杖-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
||||||
3003 千钧之刺-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
3003 千钧之刺-蓝图 true 7 3 4 false 1 100001 0 0 0 0 null 1 999999999
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,13 @@ int int mut,int#int,2 int
|
||||||
1 101009 13#6 0
|
1 101009 13#6 0
|
||||||
2 101007 1#1|2#1|3#1|4#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|12#2|13#2|14#2|15#2|1#3|2#3|12#3|13#3|14#3|15#3|1#4|11#4|12#4|13#4|14#4|15#4|1#5|13#5|14#5|15#5|1#6|5#6|6#6|14#6|15#6|1#7|3#7|4#7|5#7|6#7|7#7|8#7|13#7|14#7|15#7|3#8|4#8|5#8|6#8|7#8|8#8|14#8|15#8|4#9|5#9|6#9|7#9|8#9|6#10|7#10|15#11|5#12|12#12|1#13|4#13|1#14|8#14|9#14|10#14|11#14|12#14|13#14|1#15|8#15|9#15|10#15|11#15|12#15|13#15|1#16|2#16|13#16|1#17|2#17|3#17|4#17|10#17|11#17|12#17|13#17|15#17|1#18|2#18|3#18|11#18|12#18|1#19|10#19|11#19|12#19|13#19|1#20|2#20|3#20|15#20 1
|
2 101007 1#1|2#1|3#1|4#1|10#1|11#1|12#1|13#1|14#1|15#1|1#2|2#2|12#2|13#2|14#2|15#2|1#3|2#3|12#3|13#3|14#3|15#3|1#4|11#4|12#4|13#4|14#4|15#4|1#5|13#5|14#5|15#5|1#6|5#6|6#6|14#6|15#6|1#7|3#7|4#7|5#7|6#7|7#7|8#7|13#7|14#7|15#7|3#8|4#8|5#8|6#8|7#8|8#8|14#8|15#8|4#9|5#9|6#9|7#9|8#9|6#10|7#10|15#11|5#12|12#12|1#13|4#13|1#14|8#14|9#14|10#14|11#14|12#14|13#14|1#15|8#15|9#15|10#15|11#15|12#15|13#15|1#16|2#16|13#16|1#17|2#17|3#17|4#17|10#17|11#17|12#17|13#17|15#17|1#18|2#18|3#18|11#18|12#18|1#19|10#19|11#19|12#19|13#19|1#20|2#20|3#20|15#20 1
|
||||||
3 101008 11#2 0
|
3 101008 11#2 0
|
||||||
4 101017 2#6|6#11|10#16|3#19|12#20 1
|
4 101019 13#12 0
|
||||||
5 101018 12#16 0
|
5 101017 2#6|6#11|10#16|3#19|12#20 1
|
||||||
6 101016 10#3|12#6|3#14|14#16|9#18 1
|
6 101018 12#16 0
|
||||||
7 101015 2#19 0
|
7 101016 10#3|12#6|3#14|14#16|9#18 1
|
||||||
8 101014 10#12 0
|
8 101015 2#19 0
|
||||||
9 101001 11#8 0
|
9 101014 10#12 0
|
||||||
10 101012 13#18 0
|
10 101001 11#8 0
|
||||||
11 101011 10#18 0
|
11 101012 13#18 0
|
||||||
12 101010 4#12 0
|
12 101011 10#18 0
|
||||||
|
13 101010 4#12 0
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,12 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 105001 3#28 0
|
1 105012 15#25 0
|
||||||
2 105010 11#10 0
|
2 105001 3#28 0
|
||||||
3 105005 16#1|17#1|18#1|19#1|1#2|2#2|1#3|2#3|2#4|3#4|7#4|8#4|2#5|3#5|4#5|5#5|7#5|8#5|4#6|5#6|5#7|6#7|7#7|8#7|5#8|6#8|7#8|8#8|11#8|12#8|13#8|14#8|8#9|9#9|11#9|12#9|13#9|14#9|12#10|13#10|14#10|14#11|15#11|14#12|15#12|14#13|15#13|14#14|15#14|14#15|15#15|14#16|15#16|14#17|15#17|18#17|14#18|15#18|18#18|14#19|15#19|18#19|14#20|15#20|17#20|18#20|14#21|15#21|17#21|18#21|14#22|15#22|17#22|18#22|14#23|15#23|17#23|18#23|1#24|15#24|17#24|18#24|1#25|2#25|17#25|18#25|19#25|1#26|2#26|3#26|15#26|16#26|17#26|19#26|1#27|2#27|16#27|17#27|1#28|2#28|4#28|5#28|1#29|2#29|3#29|4#29|5#29|6#29|7#29|8#29|9#29|1#30|2#30|3#30|4#30|5#30|6#30|7#30|8#30|9#30|10#30|11#30|12#30|13#30|14#30 1
|
3 105010 3#3 0
|
||||||
4 105009 3#3 0
|
4 105021 5#4|15#6|18#16 1
|
||||||
5 105007 15#4|10#5|6#16|19#17|11#18|3#21|8#26|18#29 1
|
5 105005 16#1|17#1|18#1|19#1|1#2|2#2|1#3|2#3|2#4|3#4|7#4|8#4|2#5|3#5|4#5|5#5|7#5|8#5|4#6|5#6|5#7|6#7|7#7|8#7|5#8|6#8|7#8|8#8|11#8|12#8|13#8|14#8|8#9|9#9|11#9|12#9|13#9|14#9|12#10|13#10|14#10|14#11|15#11|14#12|15#12|14#13|15#13|14#14|15#14|14#15|15#15|14#16|15#16|14#17|15#17|18#17|14#18|15#18|18#18|14#19|15#19|18#19|14#20|15#20|17#20|18#20|14#21|15#21|17#21|18#21|14#22|15#22|17#22|18#22|14#23|15#23|17#23|18#23|1#24|15#24|17#24|18#24|1#25|2#25|17#25|18#25|19#25|1#26|2#26|3#26|15#26|16#26|17#26|19#26|1#27|2#27|16#27|17#27|1#28|2#28|4#28|5#28|1#29|2#29|3#29|4#29|5#29|6#29|7#29|8#29|9#29|1#30|2#30|3#30|4#30|5#30|6#30|7#30|8#30|9#30|10#30|11#30|12#30|13#30|14#30 1
|
||||||
6 105008 18#26 0
|
6 105002 3#24|4#24|5#24|6#24|3#25|6#25|6#26|6#27 1
|
||||||
|
7 105003 16#22|13#24|13#25|13#26|13#27|14#27|15#27 1
|
||||||
|
8 105009 1#13 0
|
||||||
|
9 105007 18#6|19#10|1#23 1
|
||||||
|
10 105008 15#30 0
|
||||||
|
|
|
||||||
|
|
@ -2,3 +2,4 @@ id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 201001 5#8 0
|
1 201001 5#8 0
|
||||||
2 201003 3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|4#3|5#3|6#3|7#3|1#4|2#4|9#4|10#4|1#5|2#5|3#5|4#5|7#5|8#5|9#5|10#5|1#6|2#6|4#6|10#7|2#9|3#9|9#9|10#9|2#10|3#10|4#10|9#10|5#12|6#12 1
|
2 201003 3#1|4#1|5#1|6#1|7#1|8#1|9#1|10#1|3#2|4#2|5#2|6#2|7#2|8#2|9#2|10#2|4#3|5#3|6#3|7#3|1#4|2#4|9#4|10#4|1#5|2#5|3#5|4#5|7#5|8#5|9#5|10#5|1#6|2#6|4#6|10#7|2#9|3#9|9#9|10#9|2#10|3#10|4#10|9#10|5#12|6#12 1
|
||||||
|
3 101013 3#6 0
|
||||||
|
|
|
||||||
|
|
@ -2,3 +2,4 @@ id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 202001 4#5 0
|
1 202001 4#5 0
|
||||||
2 202003 1#1|2#1|3#1|4#1|10#1|1#2|2#2|3#2|1#3|1#4|1#5|10#6|10#7|5#8|9#8|4#9|5#9 1
|
2 202003 1#1|2#1|3#1|4#1|10#1|1#2|2#2|3#2|1#3|1#4|1#5|10#6|10#7|5#8|9#8|4#9|5#9 1
|
||||||
|
3 101013 9#7 0
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 203001 6#6 0
|
1 101013 2#4 0
|
||||||
2 203004 1#1|2#1|10#1|1#2|2#2|8#2|1#3|8#3|9#3|1#4|1#5|1#6|2#6|10#6|1#7|10#7|9#8 1
|
2 203001 6#6 0
|
||||||
|
3 203004 1#1|2#1|10#1|1#2|2#2|8#2|1#3|8#3|9#3|1#4|1#5|1#6|2#6|10#6|1#7|10#7|9#8 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 204004 1#1|2#1|10#1|1#2|2#2|1#3|1#4|1#5|1#6|10#6|1#7|10#7|1#8|9#8|1#9|1#10|2#10 1
|
1 204004 1#1|2#1|10#1|1#2|2#2|1#3|1#4|1#5|1#6|10#6|1#7|10#7|1#8|9#8|1#9|1#10|2#10 1
|
||||||
2 204001 7#3 0
|
2 101013 2#6 0
|
||||||
|
3 204001 7#3 0
|
||||||
|
|
|
||||||
|
|
@ -2,3 +2,4 @@ id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 205001 4#2 0
|
1 205001 4#2 0
|
||||||
2 205005 1#1|2#1|10#1|1#2|2#2|1#3|9#6|10#6|10#7|1#8|4#8|1#9|3#9|4#9|1#10|2#10|3#10 1
|
2 205005 1#1|2#1|10#1|1#2|2#2|1#3|9#6|10#6|10#7|1#8|4#8|1#9|3#9|4#9|1#10|2#10|3#10 1
|
||||||
|
3 101013 2#9 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 206001 4#3 0
|
1 206001 4#3 0
|
||||||
2 206004 9#6|10#6|10#7|5#8|6#8|7#8|8#8|3#9|4#9|5#9|6#9|7#9|2#10|3#10|4#10|5#10|6#10 1
|
2 101013 9#9 0
|
||||||
|
3 206004 9#6|10#6|10#7|5#8|6#8|7#8|8#8|3#9|4#9|5#9|6#9|7#9|2#10|3#10|4#10|5#10|6#10 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 207001 7#4 0
|
1 207001 7#4 0
|
||||||
2 207005 8#1|9#1|10#1|8#2|9#2|8#3|1#6|2#6|2#7|5#8|3#9|4#9|5#9|2#10|3#10|4#10|5#10 1
|
2 101013 4#8 0
|
||||||
|
3 207005 8#1|9#1|10#1|8#2|9#2|8#3|1#6|2#6|2#7|5#8|3#9|4#9|5#9|2#10|3#10|4#10|5#10 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 208003 9#1|10#1|1#2|9#2|1#3|1#5|10#6|9#7|10#7|4#8|9#8|10#8|3#9|4#9|2#10|3#10|4#10 1
|
1 208003 9#1|10#1|1#2|9#2|1#3|1#5|10#6|9#7|10#7|4#8|9#8|10#8|3#9|4#9|2#10|3#10|4#10 1
|
||||||
2 208001 6#6 0
|
2 101013 3#8 0
|
||||||
|
3 208001 6#6 0
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 209004 9#1|10#1|1#2|9#2|1#3|1#5|5#9|8#9|9#9|4#10|5#10|8#10|1#13|1#14|2#14|3#14|1#15 1
|
1 209004 9#1|10#1|1#2|9#2|1#3|1#5|5#9|8#9|9#9|4#10|5#10|8#10|1#13|1#14|2#14|3#14|1#15 1
|
||||||
2 209001 7#3 0
|
2 101013 4#9 0
|
||||||
|
3 209001 7#3 0
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 210001 6#8 0
|
1 210001 6#8 0
|
||||||
2 210005 9#1|10#1|1#2|9#2|1#3|1#5|8#9|9#9|8#10|2#11|1#12|2#12|3#14|9#14|10#14|9#15|10#15 1
|
2 101013 9#10 0
|
||||||
|
3 210005 9#1|10#1|1#2|9#2|1#3|1#5|8#9|9#9|8#10|2#11|1#12|2#12|3#14|9#14|10#14|9#15|10#15 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 211001 4#8 0
|
1 211001 4#8 0
|
||||||
2 211004 9#1|10#1|9#2|1#4|1#5|1#8|10#11|10#12|10#13|3#14|6#14|7#14|9#14|10#14|6#15|9#15|10#15 1
|
2 101013 6#13 0
|
||||||
|
3 211004 9#1|10#1|9#2|1#4|1#5|1#8|10#11|10#12|10#13|3#14|6#14|7#14|9#14|10#14|6#15|9#15|10#15 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 212004 2#3|3#3|2#4|8#4|9#4|8#5|10#7|1#8|10#8|1#9|1#10|10#13|3#14|9#14|10#14|9#15|10#15 1
|
1 212004 2#3|3#3|2#4|8#4|9#4|8#5|10#7|1#8|10#8|1#9|1#10|10#13|3#14|9#14|10#14|9#15|10#15 1
|
||||||
2 212001 5#6 0
|
2 101013 8#6 0
|
||||||
|
3 212001 5#6 0
|
||||||
|
|
|
||||||
|
|
@ -2,3 +2,4 @@ id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 213001 7#7 0
|
1 213001 7#7 0
|
||||||
2 213003 1#1|2#1|1#2|1#3|1#4|1#5|10#7|10#8|2#12|3#12|8#12|9#12|2#13|3#13|8#13|2#14|3#14 1
|
2 213003 1#1|2#1|1#2|1#3|1#4|1#5|10#7|10#8|2#12|3#12|8#12|9#12|2#13|3#13|8#13|2#14|3#14 1
|
||||||
|
3 101013 3#11 0
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 214001 4#8 0
|
1 214001 4#8 0
|
||||||
2 214005 6#2|6#3|6#4|10#7|10#8|2#9|2#10|1#11|2#11|1#12|8#12|9#12|1#13|8#13|1#14|1#15|8#15 1
|
2 101013 8#11 0
|
||||||
|
3 214005 6#2|6#3|6#4|10#7|10#8|2#9|2#10|1#11|2#11|1#12|8#12|9#12|1#13|8#13|1#14|1#15|8#15 1
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
id Event Groups isMustAppear
|
id Event Groups isMustAppear
|
||||||
int int mut,int#int,2 int
|
int int mut,int#int,2 int
|
||||||
1 215001 4#8 0
|
1 101013 8#5 0
|
||||||
2 215004 1#1|1#2|1#3|8#3|9#3|1#4|2#4|8#4|1#5|2#5|2#6|8#6|6#9|6#10|6#11|9#11|9#12 1
|
2 215001 4#8 0
|
||||||
|
3 215004 1#1|1#2|1#3|8#3|9#3|1#4|2#4|8#4|1#5|2#5|2#6|8#6|6#9|6#10|6#11|9#11|9#12 1
|
||||||
|
|
|
||||||
|
|
@ -1,73 +1,80 @@
|
||||||
Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBocusFactor DamageReduceFactor CureFacter TreatFacter DifferDemonsReduceFactor AntiCritDamageFactor DifferDemonsBocusFactor PropertyName ElementDamageBonusFactor ElementDamageReduceFactor SkillList PassiveSkillList
|
Id MonsterId Type Profession Quality Level Hp Attack PhysicalDefence MagicDefence Speed Hit Dodge CritFactor CritDamageFactor DamageBocusFactor DamageReduceFactor CureFacter TreatFacter DifferDemonsReduceFactor AntiCritDamageFactor DifferDemonsBocusFactor PropertyName ElementDamageBonusFactor ElementDamageReduceFactor SkillList PassiveSkillList
|
||||||
int int int int int int int int int int int float float float float float float float float float float float int float mut,float#float,1 mut,int#int,1 mut,int#int,1
|
int int int int int int int int int int int float float float float float float float float float float float int float mut,float#float,1 mut,int#int,1 mut,int#int,1
|
||||||
10101 4 3 0 3 0 2778 258 64 258 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null
|
10101 4 3 0 3 0 2778 258 64 258 240 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null
|
||||||
10102 4 3 0 2 0 2778 244 64 244 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
10102 4 3 0 2 0 2778 244 64 244 400 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
||||||
10103 2 3 0 1 0 1543 105 64 105 7 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20153 null
|
10103 2 3 0 1 0 1543 105 64 105 7 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20153 null
|
||||||
10104 2 3 0 1 0 1543 105 64 105 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20152 null
|
10104 2 3 0 1 0 1543 105 64 105 240 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20152 null
|
||||||
10105 2 3 0 1 0 1543 105 64 105 400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20151 null
|
10105 2 3 0 1 0 1543 105 64 105 400 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20151 null
|
||||||
10201 10040 1 3 2 24 5482 509 131 509 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10201 10040 1 3 2 24 5482 509 131 509 816 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10202 13 1 0 1 24 1827 348 131 348 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20214#20217 null
|
10202 13 1 0 1 24 1827 348 131 348 1360 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20214#20217 null
|
||||||
10203 13 1 0 1 24 1827 348 131 348 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20216#20219 null
|
10203 13 1 0 1 24 1827 348 131 348 27 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20216#20219 null
|
||||||
10204 14 1 0 2 24 3045 226 131 226 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20221#20224 null
|
10204 14 1 0 2 24 3045 226 131 226 816 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20221#20224 null
|
||||||
10205 17 3 0 3 24 3045 387 131 387 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null
|
10205 17 3 0 3 24 3045 387 131 387 1360 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null
|
||||||
10206 17 3 0 2 24 3045 367 131 367 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20210#20213 null
|
10206 17 3 0 2 24 3045 367 131 367 27 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20210#20213 null
|
||||||
10207 23 3 0 1 24 3045 348 131 348 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
10207 23 3 0 1 24 3045 348 131 348 816 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
||||||
10208 17 3 0 2 24 3045 367 131 367 1360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null
|
10208 17 3 0 2 24 3045 367 131 367 1360 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20208#20211 null
|
||||||
10209 24 2 0 4 24 3045 242 131 242 27 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20186#20189 null
|
10209 24 2 0 4 24 3045 242 131 242 27 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20186#20189 null
|
||||||
10210 35 3 0 3 24 5482 540 131 540 816 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20245#20248 null
|
10210 35 3 0 3 24 5482 540 131 540 816 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20245#20248 null
|
||||||
10301 10040 1 0 2 40 9137 848 219 848 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10301 10040 1 0 2 40 9137 848 219 848 2000 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10302 42 1 0 1 40 5076 364 219 364 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null
|
10302 42 1 0 1 40 5076 364 219 364 39 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null
|
||||||
10303 8 3 0 2 40 5076 613 219 613 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
10303 8 3 0 2 40 5076 613 219 613 1200 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
||||||
10304 5 1 0 3 40 5076 645 219 645 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
10304 5 1 0 3 40 5076 645 219 645 2000 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
||||||
10305 23 4 0 2 40 5076 613 219 613 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20174 null
|
10305 23 4 0 2 40 5076 613 219 613 39 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20174 null
|
||||||
10306 23 4 0 2 40 5076 613 219 613 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
10306 23 4 0 2 40 5076 613 219 613 1200 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
||||||
10307 23 4 0 2 40 5076 613 219 613 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20172 null
|
10307 23 4 0 2 40 5076 613 219 613 2000 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20172 null
|
||||||
10308 5 1 0 3 40 5076 645 219 645 39 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20144#20147 null
|
10308 5 1 0 3 40 5076 645 219 645 39 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20144#20147 null
|
||||||
10309 3 2 0 3 40 5076 645 219 645 1200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20137#20140 null
|
10309 3 2 0 3 40 5076 645 219 645 1200 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20137#20140 null
|
||||||
10310 5 1 0 2 40 5076 613 219 613 2000 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
10310 5 1 0 2 40 5076 613 219 613 2000 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
||||||
10401 8 3 0 2 56 7106 858 307 858 52 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
10401 8 3 0 2 56 7106 858 307 858 52 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
||||||
10402 3 2 0 2 56 7106 858 307 858 1584 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20137#20140 null
|
10402 3 2 0 2 56 7106 858 307 858 1584 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20137#20140 null
|
||||||
10403 8 3 0 3 56 7106 904 307 904 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
10403 8 3 0 3 56 7106 904 307 904 2640 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
||||||
10404 7 2 0 2 56 4263 858 307 858 1584 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20233#20236 null
|
10404 7 2 0 2 56 4263 858 307 858 1584 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20233#20236 null
|
||||||
10405 23 3 0 3 56 7106 904 307 904 1584 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
10405 23 3 0 3 56 7106 904 307 904 1584 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
||||||
10501 21 3 0 3 72 16446 1622 395 1622 3280 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20178#20181 null
|
10501 21 3 0 3 72 16446 1622 395 1622 3280 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20178#20181 null
|
||||||
10502 23 3 0 3 72 9137 1162 395 1162 1968 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
10502 23 3 0 3 72 9137 1162 395 1162 1968 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20173 null
|
||||||
10601 8 3 0 1 88 11399 1331 490 1331 78 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
10601 8 3 0 1 88 11399 1331 490 1331 78 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
||||||
10602 4 3 0 2 88 20519 1958 490 1958 2352 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null
|
10602 4 3 0 2 88 20519 1958 490 1958 2352 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20155#20158 null
|
||||||
10701 10040 1 0 1 88 23326 2140 554 2140 3920 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10701 10040 1 0 1 88 23326 2140 554 2140 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10702 10040 1 0 1 88 23326 2140 554 2140 78 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10702 10040 1 0 1 88 23326 2140 554 2140 78 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10703 10040 1 0 1 88 23326 2140 554 2140 2352 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10703 10040 1 0 1 88 23326 2140 554 2140 2352 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10704 10040 1 0 2 88 23326 2284 554 2284 3920 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10704 10040 1 0 4 88 23326 2573 554 2573 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10801 41 1 0 2 96 25048 2720 601 2720 84 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20270#20273 null
|
10705 7 1 0 1 88 7775 1545 554 1545 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20232#20235 null
|
||||||
10802 15 4 0 3 96 13915 2036 601 2036 2544 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20203#20206 null
|
10706 7 1 0 2 88 7775 1635 554 1635 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20232#20235 null
|
||||||
10901 8 3 0 1 96 14721 2099 643 2099 4240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
10707 7 1 0 3 88 7775 1725 554 1725 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20232#20235 null
|
||||||
10902 8 3 0 1 96 14721 2099 643 2099 84 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
10708 10040 1 0 2 88 23326 2284 554 2284 3920 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
10903 8 3 0 1 96 14721 2099 643 2099 2544 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
10801 41 1 0 2 96 25048 2720 601 2720 84 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20270#20273 null
|
||||||
10904 4 3 0 2 96 26499 3184 643 3184 4240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
10802 15 4 0 3 96 13915 2036 601 2036 2544 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20203#20206 null
|
||||||
10905 41 4 0 2 96 26499 3184 643 3184 84 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20270#20273 null
|
10803 41 4 0 2 96 25048 2720 601 2720 2544 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
||||||
11001 10040 4 0 2 100 25273 3447 610 3447 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
10804 10040 1 0 1 96 25048 2544 601 2544 2544 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
11002 8 4 0 1 100 14040 2235 610 2235 4400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
10805 41 4 0 2 96 25048 2720 601 2720 2544 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
||||||
11003 8 4 0 1 100 14040 2235 610 2235 87 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
10901 8 3 0 1 96 14721 2099 643 2099 4240 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
||||||
11004 8 4 0 1 100 14040 2235 610 2235 2640 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
10902 8 3 0 1 96 14721 2099 643 2099 84 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
||||||
11101 8 4 0 1 100 34640 3740 771 3740 4400 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20268#20271 null
|
10903 8 3 0 1 96 14721 2099 643 2099 2544 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
||||||
11102 41 4 0 2 100 34640 4010 771 4010 87 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000214#1000224 null
|
10904 4 3 0 2 96 26499 3184 643 3184 4240 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
||||||
11201 10002 4 3 2 108 36604 4110 811 4110 2832 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000214#1000224 null
|
10905 41 4 0 2 96 26499 3184 643 3184 84 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20270#20273 null
|
||||||
11202 10040 4 0 2 108 36604 4110 811 4110 4720 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
11001 10040 4 0 2 100 25273 3447 610 3447 2640 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
11203 10040 4 0 2 108 36604 4110 811 4110 94 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
11002 8 4 0 1 100 14040 2235 610 2235 4400 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20226#20229 null
|
||||||
11204 41 4 0 2 108 36604 4110 811 4110 2832 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
11003 8 4 0 1 100 14040 2235 610 2235 87 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20228#20231 null
|
||||||
11205 36 4 0 3 108 20335 3044 811 3044 4720 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20250#20253 null
|
11004 8 4 0 1 100 14040 2235 610 2235 2640 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20227#20230 null
|
||||||
11301 4 4 0 2 120 58486 5466 1207 5466 104 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20156#20159 null
|
11101 8 4 0 1 100 34640 3740 771 3740 4400 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20268#20271 null
|
||||||
11302 41 4 0 2 120 58486 5466 1207 5466 3120 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
11102 41 4 0 2 100 34640 4010 771 4010 87 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000214#1000224 null
|
||||||
11303 4 2 0 2 120 58486 5466 1207 5466 5200 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
11201 10002 4 3 2 108 36604 4110 811 4110 2832 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1000214#1000224 null
|
||||||
11401 39 4 0 3 124 33232 2486 1239 2486 107 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20240#20243 null
|
11202 10040 4 0 2 108 36604 4110 811 4110 4720 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
11402 43 4 0 1 124 29909 2821 1239 2821 3216 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20284 null
|
11203 10040 4 0 2 108 36604 4110 811 4110 94 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 1004011#1004021 null
|
||||||
11403 43 4 0 1 124 29909 2821 1239 2821 5360 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20283 null
|
11204 41 4 0 2 108 36604 4110 811 4110 2832 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
||||||
11404 43 3 0 1 124 29909 2821 1239 2821 107 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20285 null
|
11205 36 4 0 3 108 20335 3044 811 3044 4720 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20250#20253 null
|
||||||
11501 42 1 0 1 128 36343 2505 1371 2505 3312 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null
|
11301 4 4 0 2 120 58486 5466 1207 5466 104 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20156#20159 null
|
||||||
11502 42 1 0 1 128 36343 2505 1371 2505 5520 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null
|
11302 41 4 0 2 120 58486 5466 1207 5466 3120 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20269#20272 null
|
||||||
11503 42 1 0 1 128 36343 2505 1371 2505 110 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null
|
11303 4 2 0 2 120 58486 5466 1207 5466 5200 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20154#20157 null
|
||||||
11504 42 1 0 1 128 36343 2505 1371 2505 3312 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null
|
11401 39 4 0 3 124 33232 2486 1239 2486 107 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20240#20243 null
|
||||||
11505 5 1 0 3 128 36343 4722 1371 4722 5520 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
11402 43 4 0 1 124 29909 2821 1239 2821 3216 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20284 null
|
||||||
|
11403 43 4 0 1 124 29909 2821 1239 2821 5360 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20283 null
|
||||||
|
11404 43 3 0 1 124 29909 2821 1239 2821 107 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20285 null
|
||||||
|
11501 42 1 0 1 128 36343 2505 1371 2505 3312 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null
|
||||||
|
11502 42 1 0 1 128 36343 2505 1371 2505 5520 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20256#20259 null
|
||||||
|
11503 42 1 0 1 128 36343 2505 1371 2505 110 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20258#20261 null
|
||||||
|
11504 42 1 0 1 128 36343 2505 1371 2505 3312 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20257#20260 null
|
||||||
|
11505 5 1 0 3 128 36343 4722 1371 4722 5520 0.2 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20142#20145 null
|
||||||
1001 4 3 0 1 0 3000 180 61 61 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20010 null
|
1001 4 3 0 1 0 3000 180 61 61 240 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20010 null
|
||||||
1002 42 1 0 1 1 1242 113 50 50 264 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null
|
1002 42 1 0 1 1 1242 113 50 50 264 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null
|
||||||
1003 42 1 0 1 1 1242 113 50 50 88 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null
|
1003 42 1 0 1 1 1242 113 50 50 88 0.3 0.3 0.2 1.5 0.0 0.0 1.0 1.0 0.0 0.0 0.0 1 0.0 0#0#0#0#0#0 20001 null
|
||||||
|
|
|
||||||
|
|
@ -1339,14 +1339,14 @@ int int int float int int
|
||||||
50006 14 100 1.0 90 90
|
50006 14 100 1.0 90 90
|
||||||
50007 14 100 1.0 120 120
|
50007 14 100 1.0 120 120
|
||||||
50008 14 100 1.0 120 120
|
50008 14 100 1.0 120 120
|
||||||
50011 3 100 1.0 10 10
|
50011 3 100 1.0 4 4
|
||||||
50012 3 100 1.0 11 11
|
50012 3 100 1.0 5 5
|
||||||
50013 3 100 1.0 12 12
|
50013 3 100 1.0 6 6
|
||||||
50014 3 100 1.0 13 13
|
50014 3 100 1.0 7 7
|
||||||
50015 3 100 1.0 14 14
|
50015 3 100 1.0 8 8
|
||||||
50016 3 100 1.0 15 15
|
50016 3 100 1.0 9 9
|
||||||
50017 3 100 1.0 16 16
|
50017 3 100 1.0 10 10
|
||||||
50018 3 100 1.0 17 17
|
50018 3 100 1.0 11 11
|
||||||
50401 1520 100 1.0 1 1
|
50401 1520 100 1.0 1 1
|
||||||
50402 1521 100 1.0 10 10
|
50402 1521 100 1.0 10 10
|
||||||
50403 1522 100 1.0 1 1
|
50403 1522 100 1.0 1 1
|
||||||
|
|
@ -1784,14 +1784,14 @@ int int int float int int
|
||||||
70006 14 100 1.0 110 110
|
70006 14 100 1.0 110 110
|
||||||
70007 14 100 1.0 140 140
|
70007 14 100 1.0 140 140
|
||||||
70008 14 100 1.0 140 140
|
70008 14 100 1.0 140 140
|
||||||
70011 3 100 1.0 11 11
|
70011 3 100 1.0 5 5
|
||||||
70012 3 100 1.0 12 12
|
70012 3 100 1.0 6 6
|
||||||
70013 3 100 1.0 13 13
|
70013 3 100 1.0 7 7
|
||||||
70014 3 100 1.0 14 14
|
70014 3 100 1.0 8 8
|
||||||
70015 3 100 1.0 15 15
|
70015 3 100 1.0 9 9
|
||||||
70016 3 100 1.0 16 16
|
70016 3 100 1.0 10 10
|
||||||
70017 3 100 1.0 17 17
|
70017 3 100 1.0 11 11
|
||||||
70018 3 100 1.0 18 18
|
70018 3 100 1.0 12 12
|
||||||
70101 1007 29 1.0 1 1
|
70101 1007 29 1.0 1 1
|
||||||
70102 1007 32 1.0 1 1
|
70102 1007 32 1.0 1 1
|
||||||
70103 1007 35 1.0 1 1
|
70103 1007 35 1.0 1 1
|
||||||
|
|
@ -1848,14 +1848,14 @@ int int int float int int
|
||||||
80006 14 100 1.0 130 130
|
80006 14 100 1.0 130 130
|
||||||
80007 14 100 1.0 160 160
|
80007 14 100 1.0 160 160
|
||||||
80008 14 100 1.0 160 160
|
80008 14 100 1.0 160 160
|
||||||
80011 3 100 1.0 13 13
|
80011 3 100 1.0 7 7
|
||||||
80012 3 100 1.0 14 14
|
80012 3 100 1.0 8 8
|
||||||
80013 3 100 1.0 15 15
|
80013 3 100 1.0 9 9
|
||||||
80014 3 100 1.0 16 16
|
80014 3 100 1.0 10 10
|
||||||
80015 3 100 1.0 17 17
|
80015 3 100 1.0 11 11
|
||||||
80016 3 100 1.0 18 18
|
80016 3 100 1.0 12 12
|
||||||
80017 3 100 1.0 19 19
|
80017 3 100 1.0 13 13
|
||||||
80018 3 100 1.0 20 20
|
80018 3 100 1.0 14 14
|
||||||
80101 1007 53 1.0 1 1
|
80101 1007 53 1.0 1 1
|
||||||
80102 1007 56 1.0 1 1
|
80102 1007 56 1.0 1 1
|
||||||
80103 1007 59 1.0 1 1
|
80103 1007 59 1.0 1 1
|
||||||
|
|
|
||||||
|
|
@ -843,16 +843,16 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
||||||
500308 20003#0.7|20003#0.7|10003#0.7 26|27|25 8320|2600#10|1#0.15#10 3.0
|
500308 20003#0.7|20003#0.7|10003#0.7 26|27|25 8320|2600#10|1#0.15#10 3.0
|
||||||
500309 20003#0.7|20003#0.7|10003#0.7 26|27|25 10400|2600#10|1#0.15#10 3.0
|
500309 20003#0.7|20003#0.7|10003#0.7 26|27|25 10400|2600#10|1#0.15#10 3.0
|
||||||
500310 20003#0.7|20003#0.7|10003#0.7 26|27|25 10400|2600#10|1#0.3#10 3.0
|
500310 20003#0.7|20003#0.7|10003#0.7 26|27|25 10400|2600#10|1#0.3#10 3.0
|
||||||
500401 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 3124|1171#5|4#300#0#1|8#0.15#1#1 4.0
|
500401 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 3124|1171#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500402 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 3124|1952#5|4#300#0#1|8#0.15#1#1 4.0
|
500402 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 3124|1952#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500403 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 6248|1952#5|4#300#0#1|8#0.15#1#1 4.0
|
500403 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 6248|1952#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500404 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 6248|3124#5|4#300#0#1|8#0.15#1#1 4.0
|
500404 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 6248|3124#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500405 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 9373|3124#5|4#300#0#1|8#0.15#1#1 4.0
|
500405 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 9373|3124#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500406 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 9373|3905#5|4#300#0#1|8#0.15#1#1 4.0
|
500406 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 9373|3905#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500407 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 12497|3905#5|4#300#0#1|8#0.15#1#1 4.0
|
500407 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 12497|3905#5|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500408 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 12497|3905#10|4#300#0#1|8#0.15#1#1 4.0
|
500408 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 12497|3905#10|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500409 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 15622|3905#10|4#300#0#1|8#0.15#1#1 4.0
|
500409 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 15622|3905#10|4#0.2#0#2|8#0.15#1#1 4.0
|
||||||
500410 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 15622|3905#10|4#700#0#1|8#0.3#1#1 4.0
|
500410 20003#0.7|20003#0.7|10000#0.7|10000#0.7 26|27|4|36 15622|3905#10|4#0.4#0#2|8#0.3#1#1 4.0
|
||||||
500501 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 5014|1#0.1#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
500501 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 5014|1#0.1#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
||||||
500502 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 5014|1#0.2#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
500502 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 5014|1#0.2#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
||||||
500503 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 10028|1#0.2#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
500503 20000#0.7|10004#0.7|10004#0.7|10004#0.7 26|4|4|4 10028|1#0.2#5#2|2#0.2#5#2|3#0.15#5#2 5.0
|
||||||
|
|
@ -883,16 +883,16 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
||||||
500708 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 23046|7201#5|0|5144#5#0 7.0
|
500708 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 23046|7201#5|0|5144#5#0 7.0
|
||||||
500709 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 28808|7201#5|0|5144#5#0 7.0
|
500709 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 28808|7201#5|0|5144#5#0 7.0
|
||||||
500710 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 28808|7201#10|0|7201#10#0 7.0
|
500710 20000#0.7|20000#0.7|10004#0.7|10004#0.7 26|27|37|40 28808|7201#10|0|7201#10#0 7.0
|
||||||
500801 20000#0.7|20000#0.7|10004#0.7 26|4|24 7758|4#300#0#3|300#12 8.0
|
500801 20000#0.7|20000#0.7|10004#0.7 26|4|43 7758|4#0.1#0#4|3000 8.0
|
||||||
500802 20000#0.7|20000#0.7|10004#0.7 26|4|24 7758|4#500#0#3|500#12 8.0
|
500802 20000#0.7|20000#0.7|10004#0.7 26|4|43 7758|4#0.2#0#4|3000 8.0
|
||||||
500803 20000#0.7|20000#0.7|10004#0.7 26|4|24 15516|4#500#0#3|500#12 8.0
|
500803 20000#0.7|20000#0.7|10004#0.7 26|4|43 15516|4#0.2#0#4|3000 8.0
|
||||||
500804 20000#0.7|20000#0.7|10004#0.7 26|4|24 15516|4#700#0#3|700#12 8.0
|
500804 20000#0.7|20000#0.7|10004#0.7 26|4|43 15516|4#0.3#0#4|3000 8.0
|
||||||
500805 20000#0.7|20000#0.7|10004#0.7 26|4|24 23274|4#700#0#3|700#12 8.0
|
500805 20000#0.7|20000#0.7|10004#0.7 26|4|43 23274|4#0.3#0#4|3000 8.0
|
||||||
500806 20000#0.7|20000#0.7|10004#0.7 26|4|24 23274|4#1000#0#3|1000#12 8.0
|
500806 20000#0.7|20000#0.7|10004#0.7 26|4|43 23274|4#0.4#0#4|3000 8.0
|
||||||
500807 20000#0.7|20000#0.7|10004#0.7 26|4|24 31032|4#1000#0#3|1000#12 8.0
|
500807 20000#0.7|20000#0.7|10004#0.7 26|4|43 31032|4#0.4#0#4|3000 8.0
|
||||||
500808 20000#0.7|20000#0.7|10004#0.7 26|4|24 31032|4#1000#0#3|1000#12 8.0
|
500808 20000#0.7|20000#0.7|10004#0.7 26|4|43 31032|4#0.4#0#4|4000 8.0
|
||||||
500809 20000#0.7|20000#0.7|10004#0.7 26|4|24 38790|4#1000#0#3|1000#12 8.0
|
500809 20000#0.7|20000#0.7|10004#0.7 26|4|43 38790|4#0.4#0#4|4000 8.0
|
||||||
500810 20000#0.7|20000#0.7|10004#0.7 26|4|24 38790|4#1000#0#3|1000#12 8.0
|
500810 20000#0.7|20000#0.7|10004#0.7 26|4|43 38790|4#0.4#0#4|5000 8.0
|
||||||
500901 20000#0.7|10004#0.7|10004#0.7 26|4|4 10436|9#0.1#5#1|10#0.2#5#1 9.0
|
500901 20000#0.7|10004#0.7|10004#0.7 26|4|4 10436|9#0.1#5#1|10#0.2#5#1 9.0
|
||||||
500902 20000#0.7|10004#0.7|10004#0.7 26|4|4 10436|9#0.2#5#1|10#0.2#5#1 9.0
|
500902 20000#0.7|10004#0.7|10004#0.7 26|4|4 10436|9#0.2#5#1|10#0.2#5#1 9.0
|
||||||
500903 20000#0.7|10004#0.7|10004#0.7 26|4|4 20872|9#0.2#5#1|10#0.2#5#1 9.0
|
500903 20000#0.7|10004#0.7|10004#0.7 26|4|4 20872|9#0.2#5#1|10#0.2#5#1 9.0
|
||||||
|
|
|
||||||
|
|
@ -51,10 +51,10 @@ int int mut,int#int,1 mut,int#int,2 mut,int#int,1
|
||||||
11312 13 3#12 14#10000 18001
|
11312 13 3#12 14#10000 18001
|
||||||
11313 13 4#8 14#10000 18001
|
11313 13 4#8 14#10000 18001
|
||||||
11314 13 5#5 14#10000 18001
|
11314 13 5#5 14#10000 18001
|
||||||
11401 15 102#1 14#10000 17001
|
11401 14 102#1 14#10000 17001
|
||||||
11406 15 115#1 14#10000 17001
|
11406 14 115#1 14#10000 17001
|
||||||
11409 15 110#1 14#10000 17001
|
11409 14 110#1 14#10000 17001
|
||||||
11413 15 115#1 14#10000 17001
|
11413 14 115#1 14#10000 17001
|
||||||
11602 16 202#1 14#10000 17001
|
11602 16 202#1 14#10000 17001
|
||||||
11603 16 203#1 14#10000 17001
|
11603 16 203#1 14#10000 17001
|
||||||
11605 16 206#1 14#10000 17001
|
11605 16 206#1 14#10000 17001
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
VipLevel Privileges VipBoxDailyReward VipBoxReward OpenRules
|
VipLevel Privileges VipBoxDailyReward VipBoxReward OpenRules
|
||||||
int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1
|
int mut,int#int,2 mut,int#int,2 mut,int#int,2 mut,int#int,1
|
||||||
0 1#10000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1 16#5 14#5000|3#500|4#50|19#3 10301#11401#11001
|
0 1#10000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#1|9#10|10#1|11#1|12#2|501#0|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#5 14#5000|3#500|4#50|19#3 10301#11401#11001
|
||||||
1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#4|8#2|9#10|10#2|11#2|12#2|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1 16#10 14#10000|3#1000|4#100|19#5 11302#10302#11602#11002
|
1 1#11000|2#10000|3#10000|4#2|5#2|6#5|7#3|8#2|9#10|10#2|11#2|12#2|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#10 14#10000|3#1000|4#100|19#5 11302#10302#11602#11002
|
||||||
2 1#11000|2#10000|3#10000|4#2|5#3|6#5|7#5|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0|16#3|1001#-1 16#11 12006#40|3#3000|4#200|19#8 10703#11903#10303#10103#11603
|
2 1#11000|2#10000|3#10000|4#2|5#3|6#5|7#3|8#3|9#10|10#3|11#3|12#3|501#1|502#0|503#0|504#0|505#0|13#0|14#0|15#0 16#11 12006#40|3#3000|4#200|19#8 10703#11903#10303#10103#11603
|
||||||
3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#5|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0|16#3|1001#-1 16#12 20#5|3#5000|4#300|19#10 10404#10204#11704#11204#11004
|
3 1#11000|2#10000|3#10000|4#2|5#3|6#10|7#3|8#4|9#10|10#4|11#4|12#3|501#1|502#1|503#0|504#0|505#0|13#1|14#0|15#0 16#12 20#5|3#5000|4#300|19#10 10404#10204#11704#11204#11004
|
||||||
4 1#11000|2#10000|3#10000|4#2|5#4|6#10|7#5|8#5|9#10|10#5|11#5|12#4|501#1|502#0|503#1|504#0|505#0|13#1|14#0|15#0|16#3|1001#-1 16#13 12013#50|20#5|4#500|19#10 11305#10305#11605#10905#10805
|
4 1#11000|2#10000|3#10000|4#2|5#4|6#10|7#4|8#5|9#10|10#5|11#5|12#4|501#1|502#0|503#1|504#0|505#0|13#1|14#0|15#0 16#13 12013#50|20#5|4#500|19#10 11305#10305#11605#10905#10805
|
||||||
5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#5|8#6|9#10|10#6|11#6|12#5|501#1|502#0|503#0|504#1|505#0|13#1|14#0|15#0|16#3|1001#-1 16#20|12013#1 21#5|12007#40|4#800|14#100000 11306#11406#10606#10106#11706
|
5 1#12000|2#10000|3#10000|4#2|5#5|6#10|7#4|8#6|9#10|10#6|11#6|12#5|501#1|502#0|503#0|504#1|505#0|13#1|14#0|15#0 16#20|12013#1 21#5|12007#40|4#800|14#100000 11306#11406#10606#10106#11706
|
||||||
6 1#12000|2#12000|3#12000|4#3|5#6|6#10|7#5|8#7|9#10|10#7|11#7|12#6|501#1|502#0|503#0|504#0|505#1|13#2|14#0|15#0|16#3|1001#-1 16#22|12013#1 10010#1|3#5000|4#800|20#5 11307#10407#11207#10307#11007
|
6 1#12000|2#12000|3#12000|4#3|5#6|6#10|7#4|8#7|9#10|10#7|11#7|12#6|501#1|502#0|503#0|504#0|505#1|13#2|14#0|15#0 16#22|12013#1 10010#1|3#5000|4#800|20#5 11307#10407#11207#10307#11007
|
||||||
7 1#12000|2#12000|3#12000|4#3|5#7|6#10|7#5|8#8|9#10|10#8|11#8|12#7|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 16#24|12013#1 6010#1|6011#1|6012#1|5#40 11908#11608#10808#11808#10608
|
7 1#12000|2#12000|3#12000|4#3|5#7|6#10|7#4|8#8|9#10|10#8|11#8|12#7|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#24|12013#1 6010#1|6011#1|6012#1|5#40 11908#11608#10808#11808#10608
|
||||||
8 1#12000|2#12000|3#12000|4#3|5#8|6#20|7#5|8#9|9#10|10#9|11#9|12#8|501#1|502#0|503#0|504#0|505#0|13#3|14#1|15#0|16#3|1001#-1 16#26|12013#1 10010#1|5#50|3#5000|20#10 11908#11608#10808#11808#10608
|
8 1#12000|2#12000|3#12000|4#3|5#8|6#20|7#5|8#9|9#10|10#9|11#9|12#8|501#1|502#0|503#0|504#0|505#0|13#3|14#1|15#0 16#26|12013#1 10010#1|5#50|3#5000|20#10 11908#11608#10808#11808#10608
|
||||||
9 1#12000|2#12000|3#12000|4#4|5#9|6#20|7#5|8#10|9#10|10#10|11#10|12#9|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#1|16#3|1001#-1 16#28|12013#2 55150#1|55166#1|8504#1|4#1000 11908#11608#10808#11808#10608
|
9 1#12000|2#12000|3#12000|4#4|5#9|6#20|7#5|8#10|9#10|10#10|11#10|12#9|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#1 16#28|12013#2 55150#1|55166#1|8504#1|4#1000 11908#11608#10808#11808#10608
|
||||||
10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#6|8#11|9#10|10#11|11#11|12#10|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 16#30|12013#2|21#1 6033#1|6034#1|4#1000|6#10 11908#11608#10808#11808#10608
|
10 1#13000|2#15000|3#12000|4#4|5#10|6#30|7#5|8#11|9#10|10#11|11#11|12#10|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#30|12013#2|21#1 6033#1|6034#1|4#1000|6#10 11908#11608#10808#11808#10608
|
||||||
11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#6|8#12|9#10|10#12|11#12|12#11|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 16#40|12013#2|21#1 10010#1|5#100|3#5000|21#15 11908#11608#10808#11808#10608
|
11 1#13000|2#15000|3#12000|4#4|5#11|6#40|7#5|8#12|9#10|10#12|11#12|12#11|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#40|12013#2|21#1 10010#1|5#100|3#5000|21#15 11908#11608#10808#11808#10608
|
||||||
12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 16#50|12013#2|21#2 6035#1|6036#1|6#10|21#20 11908#11608#10808#11808#10608
|
12 1#13000|2#15000|3#12000|4#5|5#12|6#50|7#6|8#13|9#10|10#13|11#13|12#12|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 16#50|12013#2|21#2 6035#1|6036#1|6#10|21#20 11908#11608#10808#11808#10608
|
||||||
13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#7|8#14|9#10|10#14|11#14|12#13|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 2#113 6001#1|6002#14 11908#11608#10808#11808#10608
|
13 1#14000|2#15000|3#12000|4#5|5#13|6#60|7#6|8#14|9#10|10#14|11#14|12#13|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#113 6001#1|6002#14 11908#11608#10808#11808#10608
|
||||||
14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#7|8#15|9#10|10#15|11#15|12#14|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 2#114 6001#1|6002#15 11908#11608#10808#11808#10608
|
14 1#14000|2#15000|3#12000|4#6|5#14|6#70|7#6|8#15|9#10|10#15|11#15|12#14|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#114 6001#1|6002#15 11908#11608#10808#11808#10608
|
||||||
15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#8|8#16|9#10|10#16|11#16|12#15|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0|16#3|1001#-1 2#115 6001#1|6002#16 null
|
15 1#15000|2#15000|3#12000|4#6|5#15|6#80|7#7|8#16|9#10|10#16|11#16|12#15|501#1|502#0|503#0|504#0|505#0|13#3|14#0|15#0 2#115 6001#1|6002#16 null
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,6 @@ local effectList = {
|
||||||
local f1 = args[2]
|
local f1 = args[2]
|
||||||
local f2 = args[3]
|
local f2 = args[3]
|
||||||
local ct = args[4]
|
local ct = args[4]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, f2, propertyList[pro1], f1, ct))
|
target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, f2, propertyList[pro1], f1, ct))
|
||||||
end)
|
end)
|
||||||
|
|
@ -396,7 +395,6 @@ local effectList = {
|
||||||
[24] = function(caster, target, args, interval)
|
[24] = function(caster, target, args, interval)
|
||||||
local pro1 = args[1]
|
local pro1 = args[1]
|
||||||
local f1 = args[2]
|
local f1 = args[2]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
BattleUtil.CalTreat(caster, target, floor(caster:GetRoleData(propertyList[pro1]) * f1))
|
BattleUtil.CalTreat(caster, target, floor(caster:GetRoleData(propertyList[pro1]) * f1))
|
||||||
end)
|
end)
|
||||||
|
|
@ -407,7 +405,6 @@ local effectList = {
|
||||||
local dot = args[1]
|
local dot = args[1]
|
||||||
local f1 = args[2]
|
local f1 = args[2]
|
||||||
local f2 = args[3]
|
local f2 = args[3]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
local func = function(damage)
|
local func = function(damage)
|
||||||
if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return dot == 0 or buff.damageType == dot end) then
|
if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return dot == 0 or buff.damageType == dot end) then
|
||||||
|
|
@ -574,7 +571,6 @@ local effectList = {
|
||||||
local f1 = args[3]
|
local f1 = args[3]
|
||||||
local f2 = args[4]
|
local f2 = args[4]
|
||||||
local ct = args[5]
|
local ct = args[5]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
if target.professionId == pt then
|
if target.professionId == pt then
|
||||||
target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, f2, propertyList[pro1], f1, ct))
|
target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, f2, propertyList[pro1], f1, ct))
|
||||||
|
|
@ -587,7 +583,6 @@ local effectList = {
|
||||||
local ct = args[1]
|
local ct = args[1]
|
||||||
local f1 = args[2]
|
local f1 = args[2]
|
||||||
local f2 = args[3]
|
local f2 = args[3]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
local func = function(damage)
|
local func = function(damage)
|
||||||
if BattleLogic.BuffMgr:HasBuff(target, BuffName.Control, function (buff) return ct == 0 or buff.ctrlType == ct end) then
|
if BattleLogic.BuffMgr:HasBuff(target, BuffName.Control, function (buff) return ct == 0 or buff.ctrlType == ct end) then
|
||||||
|
|
@ -616,7 +611,6 @@ local effectList = {
|
||||||
local f1 = args[2]
|
local f1 = args[2]
|
||||||
local i1 = args[3]
|
local i1 = args[3]
|
||||||
local ct = args[4]
|
local ct = args[4]
|
||||||
|
|
||||||
BattleLogic.WaitForTrigger(interval, function ()
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
local changeBuff = Buff.Create(caster, BuffName.PropertyChange, 0, propertyList[pro1], f1, ct)
|
local changeBuff = Buff.Create(caster, BuffName.PropertyChange, 0, propertyList[pro1], f1, ct)
|
||||||
changeBuff.cover = true
|
changeBuff.cover = true
|
||||||
|
|
@ -705,6 +699,14 @@ local effectList = {
|
||||||
end))
|
end))
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
--瞬间恢复[a]的生命
|
||||||
|
--a[int]
|
||||||
|
[43] = function(caster, target, args, interval)
|
||||||
|
local i1 = args[1]
|
||||||
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
|
BattleUtil.CalTreat(caster, target, i1)
|
||||||
|
end)
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
return effectList
|
return effectList
|
||||||
|
|
@ -272,7 +272,8 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor)
|
||||||
baseFactor = baseFactor or 1
|
baseFactor = baseFactor or 1
|
||||||
local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp)
|
local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp)
|
||||||
local hp = targetRole:GetRoleData(RoleDataName.Hp)
|
local hp = targetRole:GetRoleData(RoleDataName.Hp)
|
||||||
local factor = castRole:GetRoleData(RoleDataName.TreatFacter)
|
|
||||||
|
local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性
|
||||||
local factor2 = targetRole:GetRoleData(RoleDataName.CureFacter)
|
local factor2 = targetRole:GetRoleData(RoleDataName.CureFacter)
|
||||||
local baseTreat = floor(value * baseFactor * factor * factor2 + 0.5)
|
local baseTreat = floor(value * baseFactor * factor * factor2 + 0.5)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,6 @@ public class SLotteryRewardConfig implements BaseConfig {
|
||||||
return sLotteryRewardWeightByPoolId.get(poolId);
|
return sLotteryRewardWeightByPoolId.get(poolId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
Map<Integer, SLotteryRewardConfig> config = STableManager.getConfig(SLotteryRewardConfig.class);
|
Map<Integer, SLotteryRewardConfig> config = STableManager.getConfig(SLotteryRewardConfig.class);
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@ public class SWorkShopTechnology implements BaseConfig {
|
||||||
|
|
||||||
private int[][] consume;
|
private int[][] consume;
|
||||||
|
|
||||||
|
private int[] openRules;
|
||||||
|
|
||||||
private Map<Integer,Integer> willReturn;
|
private Map<Integer,Integer> willReturn;
|
||||||
|
|
||||||
public static Map<Integer,Map<Integer,SWorkShopTechnology>> sWorkTechMapByTechIdAndLevel;
|
public static Map<Integer,Map<Integer,SWorkShopTechnology>> sWorkTechMapByTechIdAndLevel;
|
||||||
|
|
@ -108,4 +110,8 @@ public class SWorkShopTechnology implements BaseConfig {
|
||||||
public void setWillReturn(Map<Integer, Integer> willReturn) {
|
public void setWillReturn(Map<Integer, Integer> willReturn) {
|
||||||
this.willReturn = willReturn;
|
this.willReturn = willReturn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int[] getOpenRules() {
|
||||||
|
return openRules;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -80,5 +80,6 @@ public interface BIReason {
|
||||||
int ARENA_CHALLENGE_CONSUME = 1020;
|
int ARENA_CHALLENGE_CONSUME = 1020;
|
||||||
|
|
||||||
|
|
||||||
|
int RINGFIRE_LOAD_CONSUME = 1021;
|
||||||
|
int SUDDENLY_REWARD = 1022;
|
||||||
}
|
}
|
||||||
|
|
@ -1614,14 +1614,6 @@ public class MapLogic {
|
||||||
public void endSuddlenlyFight(ISession session, String frames ,MessageTypeProto.MessageType messageType) throws Exception {
|
public void endSuddlenlyFight(ISession session, String frames ,MessageTypeProto.MessageType messageType) throws Exception {
|
||||||
int uid = session.getUid();
|
int uid = session.getUid();
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
String fightKey = RedisKey.getKey(RedisKey.SUDDLENLY_FIGHT, String.valueOf(uid), false);
|
|
||||||
String fightInfos = (String) RedisUtil.getInstence().get(fightKey);
|
|
||||||
if (fightInfos.isEmpty()){
|
|
||||||
LOGGER.info("endFight() uid=>{} fightKey={},fightInfos is empty", uid, fightKey);
|
|
||||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String key = RedisKey.getKey(RedisKey.SUDDLENLY_FIGHT, Integer.toString(user.getId()) , false);
|
String key = RedisKey.getKey(RedisKey.SUDDLENLY_FIGHT, Integer.toString(user.getId()) , false);
|
||||||
Map<Object , Object> valueMap = RedisUtil.getInstence().hmget(key);
|
Map<Object , Object> valueMap = RedisUtil.getInstence().hmget(key);
|
||||||
RedisUtil.getInstence().del(key);
|
RedisUtil.getInstence().del(key);
|
||||||
|
|
@ -1641,23 +1633,23 @@ public class MapLogic {
|
||||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getFindSuddenlyBossMapId());
|
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getFindSuddenlyBossMapId());
|
||||||
int[] checkResult = CheckFight.getInstance().checkFight(seed,sChallengeConfig.getMostTime(),getFightData, getOptionData);
|
int[] checkResult = CheckFight.getInstance().checkFight(seed,sChallengeConfig.getMostTime(),getFightData, getOptionData);
|
||||||
|
|
||||||
LevelDifficultyManager levelDifficultyManager = user.getLevelDifficultyManager();
|
|
||||||
//校验结果码 1:胜利
|
//校验结果码 1:胜利
|
||||||
int resultCode = checkResult[0];
|
int resultCode = checkResult[0];
|
||||||
if (resultCode == -1){
|
if (resultCode == -1){
|
||||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "战斗异常!");
|
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "战斗异常!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
FightInfoProto.FightEndResponse.Builder builderResponse = FightInfoProto.FightEndResponse
|
||||||
|
.newBuilder()
|
||||||
|
.setResult(resultCode);
|
||||||
if(resultCode == 1){
|
if(resultCode == 1){
|
||||||
|
SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(mapManager.getSuddenlyBoss());
|
||||||
|
CommonProto.Drop.Builder dropBuilder =ItemUtil.drop(user, sMonsterGroup.getRewardgroup(),1.0f,0,BIReason.SUDDENLY_REWARD);
|
||||||
|
builderResponse.setEnventDrop(dropBuilder);
|
||||||
mapManager.findSuddenlyBoss(0,0);
|
mapManager.findSuddenlyBoss(0,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
|
MessageUtil.sendMessage(session, 1, messageType.getNumber(), builderResponse.build(), true);
|
||||||
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse
|
|
||||||
.newBuilder()
|
|
||||||
.setResult(resultCode)
|
|
||||||
.build();
|
|
||||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ public class MailingSystemManager {
|
||||||
public static void init(ConfigurableApplicationContext configurableApplicationContext) throws Exception {
|
public static void init(ConfigurableApplicationContext configurableApplicationContext) throws Exception {
|
||||||
//TODO 测试用
|
//TODO 测试用
|
||||||
//初始化系统邮件信息
|
//初始化系统邮件信息
|
||||||
MailingSystem mailingSystem = MongoUtil.getInstence().getMyMongoTemplate().findById(MailingSystem.getCollectionName(), Integer.toString(GameApplication.serverId), MailingSystem.class);
|
MailingSystem mailingSystem = MongoUtil.getInstence().getMyMongoTemplate().findById(MailingSystem.getCollectionName(), GameApplication.serverId, MailingSystem.class);
|
||||||
if (mailingSystem == null){
|
if (mailingSystem == null){
|
||||||
mailingSystem = new MailingSystem();
|
mailingSystem = new MailingSystem();
|
||||||
addMailingSystem(mailingSystem);
|
addMailingSystem(mailingSystem);
|
||||||
|
|
|
||||||
|
|
@ -279,22 +279,9 @@ public class HeroLogic {
|
||||||
|
|
||||||
|
|
||||||
public int[] randomHeroByPoolId(int poolId,int randomCount,int userLevel){
|
public int[] randomHeroByPoolId(int poolId,int randomCount,int userLevel){
|
||||||
List<SLotteryRewardConfig> sLotteryRewardConfigListByPoolId = getMineSLotteryRewardConfig(poolId,randomCount,userLevel);
|
|
||||||
int totalCountByPoolId = SLotteryRewardConfig.getTotalCountByPoolId(poolId);
|
|
||||||
int randCount = MathUtils.randomInt(totalCountByPoolId) + 1;
|
|
||||||
int weight =0;
|
|
||||||
for(SLotteryRewardConfig sLotteryRewardConfig :sLotteryRewardConfigListByPoolId){
|
|
||||||
weight += sLotteryRewardConfig.getWeight();
|
|
||||||
if(weight>=randCount){
|
|
||||||
return sLotteryRewardConfig.getReward();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<SLotteryRewardConfig> getMineSLotteryRewardConfig(int poolId,int randomCount,int userLevel){
|
|
||||||
List<SLotteryRewardConfig> sLotteryRewardConfigs = new ArrayList<>();
|
List<SLotteryRewardConfig> sLotteryRewardConfigs = new ArrayList<>();
|
||||||
List<SLotteryRewardConfig> sLotteryRewardConfigListByPoolId = SLotteryRewardConfig.getSLotteryRewardConfigListByPoolId(poolId);
|
List<SLotteryRewardConfig> sLotteryRewardConfigListByPoolId = SLotteryRewardConfig.getSLotteryRewardConfigListByPoolId(poolId);
|
||||||
|
int totalCountByPoolId =0;
|
||||||
for(SLotteryRewardConfig sLotteryRewardConfig : sLotteryRewardConfigListByPoolId ){
|
for(SLotteryRewardConfig sLotteryRewardConfig : sLotteryRewardConfigListByPoolId ){
|
||||||
int[] openRules = sLotteryRewardConfig.getOpenRules();
|
int[] openRules = sLotteryRewardConfig.getOpenRules();
|
||||||
boolean canAdd = true;
|
boolean canAdd = true;
|
||||||
|
|
@ -312,12 +299,21 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
if(canAdd){
|
if(canAdd){
|
||||||
sLotteryRewardConfigs.add(sLotteryRewardConfig);
|
sLotteryRewardConfigs.add(sLotteryRewardConfig);
|
||||||
|
totalCountByPoolId+=sLotteryRewardConfig.getWeight();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return sLotteryRewardConfigs;
|
|
||||||
|
|
||||||
|
int randCount = MathUtils.randomInt(totalCountByPoolId) + 1;
|
||||||
|
int weight =0;
|
||||||
|
for(SLotteryRewardConfig sLotteryRewardConfig :sLotteryRewardConfigs){
|
||||||
|
weight += sLotteryRewardConfig.getWeight();
|
||||||
|
if(weight>=randCount){
|
||||||
|
return sLotteryRewardConfig.getReward();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getAllTeamPosInfo(ISession session) throws Exception {
|
public void getAllTeamPosInfo(ISession session) throws Exception {
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
List<CommonProto.TeamPosInfo> teamPosInfoList = new ArrayList<>();
|
List<CommonProto.TeamPosInfo> teamPosInfoList = new ArrayList<>();
|
||||||
|
|
@ -1553,8 +1549,13 @@ public class HeroLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!exists){
|
if(!exists){
|
||||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.RINGFIRE_LOAD_RESPONSE_VALUE,"not exists" +
|
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.RINGFIRE_LOAD_RESPONSE_VALUE,"not exists" );
|
||||||
"");
|
return;
|
||||||
|
}
|
||||||
|
SRingFireMaterialConfig sRingFireMaterialConfig = SRingFireMaterialConfig.config.get(comonpentId);
|
||||||
|
boolean enough = ItemUtil.itemCost(user, sRingFireMaterialConfig.getMaterial(), BIReason.RINGFIRE_LOAD_CONSUME, comonpentId);
|
||||||
|
if(!enough){
|
||||||
|
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.RINGFIRE_LOAD_RESPONSE_VALUE,"道具不足" );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
pokemon.upOrActiveComonpent(comonpentId);
|
pokemon.upOrActiveComonpent(comonpentId);
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,21 @@ public class WorkShopLogic {
|
||||||
MessageUtil.sendErrorResponse(iSession,0,msgId,"maxLevel");
|
MessageUtil.sendErrorResponse(iSession,0,msgId,"maxLevel");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
int[] openRules = sWorkShopTechnology.getOpenRules();
|
||||||
|
if(openRules!=null){
|
||||||
|
int preTechId = openRules[0];
|
||||||
|
int preTechLevel = openRules[1];
|
||||||
|
SWorkShopTechnology preSWorkShopTechnology = SWorkShopTechnology.getsWorkTechMapByTechIdAndLevel(techId, oldLevl);
|
||||||
|
int preProfession = preSWorkShopTechnology.getProfession();
|
||||||
|
int preMineLevl = 0;
|
||||||
|
if( workShopController.getTechnologyMap().containsKey(preProfession) && workShopController.getTechnologyMap().get(preProfession).containsKey(preTechId)){
|
||||||
|
preMineLevl = workShopController.getTechnologyMap().get(preProfession).get(preTechId);
|
||||||
|
}
|
||||||
|
if(preMineLevl<preTechLevel){
|
||||||
|
MessageUtil.sendErrorResponse(iSession,0,msgId,"前置节点未完成");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
workShopController.updateTechLevel(profession,techId,oldLevl + 1);
|
workShopController.updateTechLevel(profession,techId,oldLevl + 1);
|
||||||
int[][] consume = sWorkShopTechnology.getConsume();
|
int[][] consume = sWorkShopTechnology.getConsume();
|
||||||
boolean enough = ItemUtil.itemCost(user, consume, BIReason.WORKSHOP_TECHNOLOGY_CONSUME, sWorkShopTechnology.getId());
|
boolean enough = ItemUtil.itemCost(user, consume, BIReason.WORKSHOP_TECHNOLOGY_CONSUME, sWorkShopTechnology.getId());
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ public class HeroLevelUpManager implements BaseDataManager{
|
||||||
@Override
|
@Override
|
||||||
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) {
|
||||||
if(missionType == MissionType.HERO_LEVLE_COUNT){
|
if(missionType == MissionType.HERO_LEVLE_COUNT){
|
||||||
int oldLevle = (int)parm[0];
|
int oldLevle = (int)parm[0]+1;
|
||||||
int newLevle = (int)parm[1];
|
int newLevle = (int)parm[1];
|
||||||
Map<Integer, Integer> heroLevleCountMap = data.getHeroLevleCountMap();
|
Map<Integer, Integer> heroLevleCountMap = data.getHeroLevleCountMap();
|
||||||
for(;oldLevle<=newLevle;oldLevle++){
|
for(;oldLevle<=newLevle;oldLevle++){
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ public class RoomManager {
|
||||||
private static final List<Integer> matchingPlayerList = new ArrayList();
|
private static final List<Integer> matchingPlayerList = new ArrayList();
|
||||||
private static Object lock; //线程安全锁
|
private static Object lock; //线程安全锁
|
||||||
|
|
||||||
private static int PLAYER_NUMBER_IN_ROOM = 2; //单个房间的最大数量
|
private static int PLAYER_NUMBER_IN_ROOM = 3; //单个房间的最大数量
|
||||||
|
|
||||||
public static int SIMPLEST_MATCH_RULE = 0;
|
public static int SIMPLEST_MATCH_RULE = 0;
|
||||||
|
|
||||||
|
|
@ -120,7 +120,7 @@ public class RoomManager {
|
||||||
user.getRoomInfo().setMatching(false);
|
user.getRoomInfo().setMatching(false);
|
||||||
user.getRoomInfo().setRoomId(roomId);
|
user.getRoomInfo().setRoomId(roomId);
|
||||||
RoomProto.AgentInfo.Builder agentInfoBuilder = RoomProto.AgentInfo.newBuilder();
|
RoomProto.AgentInfo.Builder agentInfoBuilder = RoomProto.AgentInfo.newBuilder();
|
||||||
int curXY = CellUtil.xy2Pos(4 + i, 4 + i);
|
int curXY = CellUtil.xy2Pos( i*10+1, i*10+1);
|
||||||
agentInfoBuilder.setPlayerUid(user.getId())
|
agentInfoBuilder.setPlayerUid(user.getId())
|
||||||
.setCurHp(1000)
|
.setCurHp(1000)
|
||||||
.setMaxHp(1000)
|
.setMaxHp(1000)
|
||||||
|
|
@ -154,12 +154,16 @@ public class RoomManager {
|
||||||
Map<Integer, RoomPlayerInfo> roomPlayers = room.getRoomPlayers();
|
Map<Integer, RoomPlayerInfo> roomPlayers = room.getRoomPlayers();
|
||||||
List<RoomProto.AgentInfo> agentInfoList = new ArrayList<>();
|
List<RoomProto.AgentInfo> agentInfoList = new ArrayList<>();
|
||||||
for(RoomPlayerInfo roomPlayerInfo:roomPlayers.values()) {
|
for(RoomPlayerInfo roomPlayerInfo:roomPlayers.values()) {
|
||||||
|
if(!roomPlayerInfo.getPath().isEmpty()){
|
||||||
|
roomPlayerInfo.move(System.currentTimeMillis());
|
||||||
|
}
|
||||||
RoomProto.AgentInfo.Builder agentInfoBuilder = RoomProto.AgentInfo.newBuilder();
|
RoomProto.AgentInfo.Builder agentInfoBuilder = RoomProto.AgentInfo.newBuilder();
|
||||||
agentInfoBuilder.setPlayerUid(roomPlayerInfo.getUid())
|
agentInfoBuilder.setPlayerUid(roomPlayerInfo.getUid())
|
||||||
.setCurHp(1000)
|
.setCurHp(1000)
|
||||||
.setMaxHp(1000)
|
.setMaxHp(1000)
|
||||||
.setCamp(roomPlayerInfo.getCamp())
|
.setCamp(roomPlayerInfo.getCamp())
|
||||||
.setCurXY(roomPlayerInfo.getCurPos());
|
.setCurXY(roomPlayerInfo.getCurPos())
|
||||||
|
.addAllPath(roomPlayerInfo.getPath());
|
||||||
agentInfoList.add(agentInfoBuilder.build());
|
agentInfoList.add(agentInfoBuilder.build());
|
||||||
}
|
}
|
||||||
MessageUtil.sendRoomInfoToPerson(iSession, room.getType(), roomId, 1, cells, agentInfoList);
|
MessageUtil.sendRoomInfoToPerson(iSession, room.getType(), roomId, 1, cells, agentInfoList);
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,17 @@
|
||||||
package com.ljsd.jieling.logic.room;
|
package com.ljsd.jieling.logic.room;
|
||||||
|
|
||||||
import com.ljsd.jieling.protocols.RoomFightProto;
|
import com.ljsd.jieling.protocols.RoomFightProto;
|
||||||
|
import com.ljsd.jieling.thread.task.MinuteTask;
|
||||||
import com.ljsd.jieling.util.CellUtil;
|
import com.ljsd.jieling.util.CellUtil;
|
||||||
import com.ljsd.jieling.util.MapPoint;
|
import com.ljsd.jieling.util.MapPoint;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class RoomPlayerInfo {
|
public class RoomPlayerInfo {
|
||||||
|
private static final Logger LOGGER = LoggerFactory.getLogger(RoomPlayerInfo.class);
|
||||||
private int uid;
|
private int uid;
|
||||||
|
|
||||||
public static final int UNREADY_STATE = 0; //还未准备
|
public static final int UNREADY_STATE = 0; //还未准备
|
||||||
|
|
@ -28,12 +32,17 @@ public class RoomPlayerInfo {
|
||||||
|
|
||||||
//用户移动到新位置, 返回下一个点的坐标,用户展示客户端的转向,及模拟移动
|
//用户移动到新位置, 返回下一个点的坐标,用户展示客户端的转向,及模拟移动
|
||||||
public boolean move(List<Integer> path){
|
public boolean move(List<Integer> path){
|
||||||
|
long timestamp = System.currentTimeMillis();
|
||||||
if(!this.path.isEmpty()){
|
if(!this.path.isEmpty()){
|
||||||
move(System.currentTimeMillis());
|
move(timestamp);
|
||||||
}
|
}
|
||||||
boolean continuous = CellUtil.isContinuous(curPos, path);
|
boolean continuous = CellUtil.isContinuous(curPos, path);
|
||||||
if(continuous){
|
if(continuous){
|
||||||
this.path = path;
|
this.path.clear();
|
||||||
|
this.path.addAll(path);
|
||||||
|
this.path.remove(0);
|
||||||
|
preMoveTimestamp = timestamp;
|
||||||
|
LOGGER.info("the uid={},the preMoveTimestamp={}",uid,preMoveTimestamp);
|
||||||
}
|
}
|
||||||
return continuous;
|
return continuous;
|
||||||
}
|
}
|
||||||
|
|
@ -44,15 +53,18 @@ public class RoomPlayerInfo {
|
||||||
if(path.size() <= 0){
|
if(path.size() <= 0){
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
int nextPoint = path.get(0);
|
int moveDistance = (int)((timestamp - preMoveTimestamp)/speed);
|
||||||
int moveDistance = (int)((timestamp - preMoveTimestamp)*speed);
|
|
||||||
if(moveDistance < 1){
|
if(moveDistance < 1){
|
||||||
//格子没有发生变化
|
//格子没有发生变化
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
for(int i=0; i<moveDistance && i<path.size(); i++){
|
int oldXY=curPos;
|
||||||
|
int pathSize = path.size();
|
||||||
|
for(int i=0; i<moveDistance && i<pathSize; i++){
|
||||||
curPos = path.remove(0);
|
curPos = path.remove(0);
|
||||||
}
|
}
|
||||||
|
LOGGER.info("the uid={},the preMoveTimestamp={},the time ={},move={},the oldXy={},the curXy={}",uid,preMoveTimestamp,timestamp,moveDistance,oldXY,curPos);
|
||||||
|
|
||||||
preMoveTimestamp = timestamp;
|
preMoveTimestamp = timestamp;
|
||||||
return curPos;
|
return curPos;
|
||||||
}
|
}
|
||||||
|
|
@ -88,6 +100,10 @@ public class RoomPlayerInfo {
|
||||||
this.camp = camp;
|
this.camp = camp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Integer> getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
//todo ……
|
//todo ……
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,17 @@
|
||||||
package com.ljsd.jieling.logic.store;
|
package com.ljsd.jieling.logic.store;
|
||||||
|
|
||||||
import com.ljsd.jieling.config.SActivityRewardConfig;
|
import com.ljsd.jieling.config.SActivityRewardConfig;
|
||||||
|
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
|
||||||
import com.ljsd.jieling.config.SRechargeCommodityConfig;
|
import com.ljsd.jieling.config.SRechargeCommodityConfig;
|
||||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
|
||||||
import com.ljsd.jieling.globals.BIReason;
|
import com.ljsd.jieling.globals.BIReason;
|
||||||
|
import com.ljsd.jieling.globals.Global;
|
||||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityType;
|
import com.ljsd.jieling.logic.activity.ActivityType;
|
||||||
import com.ljsd.jieling.logic.dao.RechargeInfo;
|
import com.ljsd.jieling.logic.dao.RechargeInfo;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.protocols.CommonProto;
|
import com.ljsd.jieling.protocols.CommonProto;
|
||||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||||
|
|
@ -70,7 +72,7 @@ public class BuyGoodsLogic {
|
||||||
int[][] baseReward = sRechargeCommodityConfig.getBaseReward();
|
int[][] baseReward = sRechargeCommodityConfig.getBaseReward();
|
||||||
int length = baseReward.length;
|
int length = baseReward.length;
|
||||||
|
|
||||||
CommonProto.Drop.Builder drop = null;
|
String rewardStr="";
|
||||||
if(buyCount == 1){
|
if(buyCount == 1){
|
||||||
|
|
||||||
if(type==GiftGoodsType.GROTHFOUND){
|
if(type==GiftGoodsType.GROTHFOUND){
|
||||||
|
|
@ -105,15 +107,15 @@ public class BuyGoodsLogic {
|
||||||
for(int j=0;j<reward.length;j++){
|
for(int j=0;j<reward.length;j++){
|
||||||
result[i++] = reward[j];
|
result[i++] = reward[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
rewardStr = ItemUtil.getMailReward(result);
|
||||||
drop = ItemUtil.drop(user, result, BIReason.RECHARGE_REWARD);
|
|
||||||
}else{
|
}else{
|
||||||
drop = ItemUtil.drop(user, baseReward, BIReason.RECHARGE_REWARD);
|
// drop = ItemUtil.drop(user, baseReward, BIReason.RECHARGE_REWARD);
|
||||||
|
rewardStr = ItemUtil.getMailReward(baseReward);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
drop = ItemUtil.drop(user, baseReward, BIReason.RECHARGE_REWARD);
|
// drop = ItemUtil.drop(user, baseReward, BIReason.RECHARGE_REWARD);
|
||||||
|
rewardStr = ItemUtil.getMailReward(baseReward);
|
||||||
}
|
}
|
||||||
|
|
||||||
int saveAmt = rechargeInfo.getSaveAmt();
|
int saveAmt = rechargeInfo.getSaveAmt();
|
||||||
|
|
@ -126,16 +128,11 @@ public class BuyGoodsLogic {
|
||||||
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt(),null);
|
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt(),null);
|
||||||
buyGoodsTimes.put(goodsId,buyCount);
|
buyGoodsTimes.put(goodsId,buyCount);
|
||||||
rechargeInfo.setBuyGoodsTimes(buyGoodsTimes);
|
rechargeInfo.setBuyGoodsTimes(buyGoodsTimes);
|
||||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(uid);
|
|
||||||
if(sessionByUid!=null){
|
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_title");
|
||||||
PlayerInfoProto.BuyGoodsDropIndication.Builder builder = PlayerInfoProto.BuyGoodsDropIndication.newBuilder().setDrop(drop);
|
String content = SErrorCodeEerverConfig.getI18NMessage("recharge_txt");
|
||||||
MessageUtil.sendIndicationMessage(sessionByUid,1,MessageTypeProto.MessageType.BUY_GOODS_DROP_INDICATION_VALUE,builder.build(),true);
|
int nowTime =(int) (TimeUtils.now()/1000);
|
||||||
try {
|
MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr,nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||||
MongoUtil.getInstence().lastUpdate();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,16 @@ import com.ljsd.jieling.logic.dao.PlayerManager;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||||
|
import com.ljsd.jieling.logic.room.Room;
|
||||||
|
import com.ljsd.jieling.logic.room.RoomManager;
|
||||||
|
import com.ljsd.jieling.logic.room.RoomPlayerInfo;
|
||||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||||
import com.ljsd.jieling.netty.cocdex.Tea;
|
import com.ljsd.jieling.netty.cocdex.Tea;
|
||||||
import com.ljsd.jieling.netty.handler.GameMessageHandler;
|
import com.ljsd.jieling.netty.handler.GameMessageHandler;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.protocol.ProtocolsAbstract;
|
import com.ljsd.jieling.protocol.ProtocolsAbstract;
|
||||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||||
|
import com.ljsd.jieling.protocols.RoomFightProto;
|
||||||
import com.ljsd.jieling.session.GameSession;
|
import com.ljsd.jieling.session.GameSession;
|
||||||
import com.ljsd.jieling.util.MathUtils;
|
import com.ljsd.jieling.util.MathUtils;
|
||||||
import com.ljsd.jieling.util.MessageUtil;
|
import com.ljsd.jieling.util.MessageUtil;
|
||||||
|
|
@ -280,6 +284,18 @@ public class ProtocolsManager implements ProtocolsAbstract {
|
||||||
// } catch (FileNotFoundException e) {
|
// } catch (FileNotFoundException e) {
|
||||||
// e.printStackTrace();
|
// e.printStackTrace();
|
||||||
// }
|
// }
|
||||||
|
User user = UserManager.getUserInMem(session.getUid());
|
||||||
|
int roomId = user.getRoomInfo().getRoomId();
|
||||||
|
if(roomId!=-1){
|
||||||
|
Room room = RoomManager.getRoomById(roomId);
|
||||||
|
if(room!=null){
|
||||||
|
RoomPlayerInfo roomPlayerInfo = room.getRoomPlayers().get(session.getUid());
|
||||||
|
roomPlayerInfo.move(System.currentTimeMillis());
|
||||||
|
roomPlayerInfo.getPath().clear();
|
||||||
|
RoomFightProto.RoomMapPointIndication build = RoomFightProto.RoomMapPointIndication.newBuilder().setEventType(10).setPlayer(session.getUid()).setTriggerXY(roomPlayerInfo.getCurPos()).build();
|
||||||
|
RoomManager.sendRoomMapPointIndication(room.getRoomPlayers().keySet(),build,MessageTypeProto.MessageType.ROOM_MAP_POINT_INDICATION_VALUE);
|
||||||
|
}
|
||||||
|
}
|
||||||
if(session.getOfflineType() == ErrorCode.reloginCode){
|
if(session.getOfflineType() == ErrorCode.reloginCode){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -296,7 +312,6 @@ public class ProtocolsManager implements ProtocolsAbstract {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
OnlineUserManager.userOffline(session.getUid());
|
OnlineUserManager.userOffline(session.getUid());
|
||||||
User user = UserManager.getUser(session.getUid());
|
|
||||||
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||||
playerInfoManager.setOffLineTime(TimeUtils.now());
|
playerInfoManager.setOffLineTime(TimeUtils.now());
|
||||||
long onlineTime = playerInfoManager.getOffLineTime() - playerInfoManager.getLoginTime();
|
long onlineTime = playerInfoManager.getOffLineTime() - playerInfoManager.getLoginTime();
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,9 @@ public class CellUtil {
|
||||||
int[] new_xy = pos2XY(i);
|
int[] new_xy = pos2XY(i);
|
||||||
System.out.println("=======> nX : "+new_xy[0]+" , nY : "+new_xy[1]);
|
System.out.println("=======> nX : "+new_xy[0]+" , nY : "+new_xy[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
System.out.println(pos2XY(520)[0]);
|
||||||
|
System.out.println(pos2XY(520)[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -111,15 +114,32 @@ public class CellUtil {
|
||||||
return false ;
|
return false ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean checkIsNextOrMineCell(int pos1 , int pos2){
|
||||||
|
int[] xy1 = pos2XY(pos1);
|
||||||
|
int[] xy2 = pos2XY(pos2);
|
||||||
|
if(pos1 == pos2){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if ((xy1[0]==xy2[0] && Math.abs(xy1[1]-xy2[1])==1) || (xy1[1]==xy2[1] && Math.abs(xy1[0]-xy2[0])==1)){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static boolean isContinuous(int lastXY, List<Integer> cells){
|
public static boolean isContinuous(int lastXY, List<Integer> cells){
|
||||||
boolean first = false;
|
boolean first = false;
|
||||||
if (cells.size() > 0) {
|
if (cells.size() > 0) {
|
||||||
first = checkIsNextCell(lastXY, cells.get(0));
|
first = checkIsNextOrMineCell(lastXY, cells.get(0));
|
||||||
|
if(!first){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for (int i = 1; i < cells.size() - 1; i++) {
|
for (int i = 1; i < cells.size() - 1; i++) {
|
||||||
boolean other = checkIsNextCell(cells.get(i), cells.get(i + 1));
|
boolean other = checkIsNextOrMineCell(cells.get(i), cells.get(i + 1));
|
||||||
if (!first && !other) {
|
if (!other) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -177,6 +177,15 @@ public class ItemUtil {
|
||||||
return getReward(itemMap,cardMap,equipMap,randomMap);
|
return getReward(itemMap,cardMap,equipMap,randomMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getMailReward (int[][] dropGroupIds) throws Exception {
|
||||||
|
Map<Integer, Integer> itemMap = new HashMap<>();
|
||||||
|
Map<Integer, Integer> cardMap = new HashMap<>();
|
||||||
|
Map<Integer, Integer> equipMap = new HashMap<>();
|
||||||
|
Map<Integer,Integer> randomMap = new HashMap<>();
|
||||||
|
selectItemArr(dropGroupIds,cardMap,itemMap,equipMap,randomMap);
|
||||||
|
return getReward(itemMap,cardMap,equipMap,randomMap);
|
||||||
|
}
|
||||||
|
|
||||||
public static void combineReward(int[] dropGroupIds,float dropRatio, Map<Integer, Integer> itemMap, Map<Integer, Integer> cardMap, Map<Integer, Integer> equipMap, Map<Integer, Integer> randomMap){
|
public static void combineReward(int[] dropGroupIds,float dropRatio, Map<Integer, Integer> itemMap, Map<Integer, Integer> cardMap, Map<Integer, Integer> equipMap, Map<Integer, Integer> randomMap){
|
||||||
for (int dropGroupId :dropGroupIds){
|
for (int dropGroupId :dropGroupIds){
|
||||||
SRewardGroup sRewardGroup = SRewardGroup.getsRewardItemMap().get(dropGroupId);
|
SRewardGroup sRewardGroup = SRewardGroup.getsRewardItemMap().get(dropGroupId);
|
||||||
|
|
@ -417,9 +426,6 @@ public class ItemUtil {
|
||||||
if(itemNum>=0){
|
if(itemNum>=0){
|
||||||
itemProtoList.add(CBean2Proto.getItem(item,itemNum));
|
itemProtoList.add(CBean2Proto.getItem(item,itemNum));
|
||||||
}
|
}
|
||||||
if (entry.getKey() == Global.STAMINA){
|
|
||||||
LOGGER.info("增加的=========num={}, 操作后={}, 时间={}",itemNum,user.getItemManager().getItemMap().get(Global.STAMINA).getItemNum(),user.getItemManager().getItemMap().get(Global.STAMINA).getEndingTime());
|
|
||||||
}
|
|
||||||
if(sItem.getItemType() == GlobalItemType.POKENMON_COMONPENT){
|
if(sItem.getItemType() == GlobalItemType.POKENMON_COMONPENT){
|
||||||
String nickName = user.getPlayerInfoManager().getNickName();
|
String nickName = user.getPlayerInfoManager().getNickName();
|
||||||
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_differ_content", new Object[]{nickName,sItem.getName()});
|
String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_differ_content", new Object[]{nickName,sItem.getName()});
|
||||||
|
|
@ -578,9 +584,6 @@ public class ItemUtil {
|
||||||
temporaryItemList.remove(userItem.getKey());
|
temporaryItemList.remove(userItem.getKey());
|
||||||
needCount = Math.abs(leftNum);
|
needCount = Math.abs(leftNum);
|
||||||
}
|
}
|
||||||
if (userItem.getKey() == Global.STAMINA){
|
|
||||||
LOGGER.info("消耗的=========num={}, 操作后={}, 时间={}",needCount,user.getItemManager().getItemMap().get(Global.STAMINA).getItemNum(),user.getItemManager().getItemMap().get(Global.STAMINA).getEndingTime());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Item myItem = itemManager.getItem(userItem.getKey());
|
Item myItem = itemManager.getItem(userItem.getKey());
|
||||||
if (null == myItem) {
|
if (null == myItem) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue