Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.javaback_recharge
jiahuiwen
commit
7cae5ca7ca
|
|
@ -0,0 +1,3 @@
|
|||
id Total Box
|
||||
int int mut,int#int,2
|
||||
101 100 40#2001|60#2002|100#2020
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
id MapId Logic Values Score
|
||||
int int int mut,int#int,1 int
|
||||
1 101 1 101009#1 20
|
||||
2 101 1 101016#1 25
|
||||
3 101 3 0#1 5
|
||||
4 101 3 0#2 5
|
||||
5 101 3 0#3 5
|
||||
6 101 3 0#4 5
|
||||
7 101 3 0#5 5
|
||||
8 101 3 0#6 5
|
||||
9 101 3 0#7 5
|
||||
10 101 3 0#8 5
|
||||
11 101 3 0#9 5
|
||||
12 101 3 0#10 5
|
||||
13 101 3 0#11 5
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Id OpenLevel RecommendForce RecommendHeroIds MinNum BaseRewardGroup RandomRewardGroup RecommendRewardGroup
|
||||
int int int mut,int#int,1 int mut,int#int,1 mut,int#int,1 mut,int#int,2
|
||||
1 101001 1000 2#1#2 5 101 111 2001#2002#2003|2001#2002#2003
|
||||
2 102001 2000 2#1#2 5 102 112 2001#2002#2003|2001#2002#2003
|
||||
3 102001 3000 2#1#2 5 103 113 2001#2002#2003|2001#2002#2003
|
||||
4 102001 4000 2#1#2 5 104 114 2001#2002#2003|2001#2002#2003
|
||||
5 102001 5000 2#1#2 5 105 115 2001#2002#2003|2001#2002#2003
|
||||
1 102023 1000 2#1#2 5 101 111 4#121#6#122#8#123|4#124#6#125#8#126
|
||||
2 104030 2000 2#1#2 5 102 112 4#121#6#122#8#123|4#124#6#125#8#126
|
||||
3 109026 3000 2#1#2 5 103 113 4#121#6#122#8#123|4#124#6#125#8#126
|
||||
4 102001 4000 2#1#2 5 104 114 4#121#6#122#8#123|4#124#6#125#8#126
|
||||
5 102001 5000 2#1#2 5 105 115 4#121#6#122#8#123|4#124#6#125#8#126
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Id ConsumeGemRatio BaseRewardRatio RandomRewardRatio PerMapMaxHour HourRewardRatio
|
||||
int mut,int#int,1 mut,float#float,2 mut,float#float,2 int mut,float#float,1
|
||||
1 0#0#50#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062
|
||||
2 0#0#55#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062
|
||||
3 0#0#60#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062
|
||||
4 0#0#70#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062
|
||||
5 0#0#80#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#-0.0128#0.1086#0.9062
|
||||
1 0#0#50#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#0#1#0
|
||||
2 0#0#55#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#0#1#0
|
||||
3 0#0#60#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#0#1#0
|
||||
4 0#0#70#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#0#1#0
|
||||
5 0#0#80#0 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 0.7#0.4|0.8#0.6|0.9#0.8|1#1|1.1#1.1|1.2#1.2|1.3#1.3|1.4#1.4|1.5#1.5 8 0#0#1#0
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Id Name Include
|
||||
int string mut,float#float,1
|
||||
1 无名之森 101#111
|
||||
2 河口平原 102#104#112
|
||||
1 无名之森 101
|
||||
2 河口平原 102#104
|
||||
3 御水之都 103#105#108
|
||||
4 御水之都废墟 109
|
||||
5 血色沼泽 106#107#110
|
||||
|
|
|
|||
|
|
@ -178,6 +178,16 @@ int
|
|||
4005
|
||||
5001
|
||||
5002
|
||||
6001
|
||||
6002
|
||||
6003
|
||||
6004
|
||||
6005
|
||||
6006
|
||||
6007
|
||||
6008
|
||||
6009
|
||||
6010
|
||||
10001
|
||||
10002
|
||||
10003
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
Id Commodity Weight Costs Limit Pool
|
||||
int mut,int#int,1 int mut,int#int,1 int int
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition
|
||||
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
|
||||
1 3#10000|14#90000|10008#1|10013#1|10023#1|19#20|1503#8|6001#1|6002#1|6003#1|6004#1|6005#1|6006#1|6007#1|6008#1|6009#1|6010#1|6011#1|6012#1|6013#1|6014#1|6015#1|6016#1|6017#1|6018#1|6019#1|6020#1|6021#1|6022#1|6023#1|6024#1|6025#1|6026#1|6027#1|6028#1|6029#1|6030#1|6031#1|6032#1 0#0#0.3164#0 100 2#5 0#0#1#0 70#100 999 9999 1 05#09
|
||||
1 3#10000|14#90000|10008#1|10013#1|10023#1|19#20|1503#8|6001#1|6002#1|6003#1|6004#1|6005#1|6006#1|6007#1|6008#1|6009#1|6010#1|6011#1|6012#1|6013#1|6014#1|6015#1|6016#1|6017#1|6018#1|6019#1|6020#1|6021#1|6022#1|6023#1|6024#1|6025#1|6026#1|6027#1|6028#1|6029#1|6030#1|6031#1|6032#1 0#0#0.3164#0 100 60#1 0#0#1#0 70#100 999 9999 1 05#09
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ int int int int int int int float float float float float int mut,int#int,2 mut,
|
|||
10018 11018 50 5 3 5 10 1443.0 280.0 134.0 161.0 154.0 15 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001811|5#1001821|6#1001811|6#1001821|7#1001812|7#1001822|8#1001813|8#1001822|9#1001813|9#1001823|10#1001814|10#1001824
|
||||
10019 11019 50 5 1 3 10 1436.0 284.0 152.0 127.0 149.0 15 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1001911|5#1001921|6#1001911|6#1001921|7#1001912|7#1001922|8#1001913|8#1001922|9#1001913|9#1001923|10#1001914|10#1001924
|
||||
10020 11020 50 5 5 1 10 2279.0 164.0 264.0 220.0 152.0 15 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002011|5#1002021|6#1002011|6#1002021|7#1002012|7#1002022|8#1002013|8#1002022|9#1002013|9#1002023|10#1002014|10#1002024
|
||||
10021 11021 40 5 2 2 10 1920.0 205.0 170.0 204.0 178.0 15 6#1#3#1|6#2#41#4|5#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124
|
||||
10022 11022 40 5 3 3 10 1676.0 244.0 167.0 200.0 173.0 15 6#1#3#1|6#2#43#4|5#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224
|
||||
10023 11023 40 5 4 5 10 1439.0 280.0 131.0 157.0 168.0 15 6#1#3#1|6#2#44#4|5#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324
|
||||
10021 11021 40 5 2 2 10 1920.0 205.0 170.0 204.0 178.0 15 6#1#3#1|6#2#41#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002111|5#1002121|6#1002111|6#1002121|7#1002112|7#1002122|8#1002113|8#1002122|9#1002113|9#1002123|10#1002114|10#1002124
|
||||
10022 11022 40 5 3 3 10 1676.0 244.0 167.0 200.0 173.0 15 6#1#3#1|6#2#43#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002211|5#1002221|6#1002211|6#1002221|7#1002212|7#1002222|8#1002213|8#1002222|9#1002213|9#1002223|10#1002214|10#1002224
|
||||
10023 11023 40 5 4 5 10 1439.0 280.0 131.0 157.0 168.0 15 6#1#3#1|6#2#44#4|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#1 5#1002311|5#1002321|6#1002311|6#1002321|7#1002312|7#1002322|8#1002313|8#1002322|9#1002313|9#1002323|10#1002314|10#1002324
|
||||
10024 11024 40 4 3 3 10 1933.0 138.0 216.0 180.0 182.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002411|4#1002421|5#1002411|5#1002421|6#1002411|6#1002421|7#1002412|7#1002422|8#1002413|8#1002422|9#1002413|9#1002423
|
||||
10025 11025 40 4 1 1 10 1630.0 174.0 146.0 175.0 166.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002511|4#1002521|5#1002511|5#1002521|6#1002511|6#1002521|7#1002512|7#1002522|8#1002513|8#1002522|9#1002513|9#1002523
|
||||
10026 11026 40 4 5 3 10 2051.0 138.0 216.0 180.0 181.0 15 5#1#2#3|5#2#15#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|8#2#18#1|9#1#3#1|9#2#18#1|9#3#17#2 4#1002611|4#1002621|5#1002611|5#1002621|6#1002611|6#1002621|7#1002612|7#1002622|8#1002613|8#1002622|9#1002613|9#1002623
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ int int int int int int int
|
|||
101030 5 3 1 0 101207 0
|
||||
101031 5 0 0 0 101210 0
|
||||
101032 5 0 0 0 0 0
|
||||
101033 0 0 2 0 0 0
|
||||
101034 0 0 2 0 0 0
|
||||
101035 0 0 2 0 0 0
|
||||
101033 5 2 2 0 101220 0
|
||||
101034 5 2 2 0 101222 0
|
||||
101035 7 3 2 0 101224 0
|
||||
0 0 0 0 0 0 0
|
||||
102001 1 2 1 0 102001 0
|
||||
102002 1 2 1 0 102002 0
|
||||
|
|
@ -67,11 +67,13 @@ int int int int int int int
|
|||
102023 5 3 2 0 102141 0
|
||||
102024 5 3 2 0 102066 0
|
||||
102025 5 3 2 0 102084 0
|
||||
102026 5 3 2 0 102152 0
|
||||
102026 5 3 2 0 102156 0
|
||||
102028 5 3 2 0 102109 0
|
||||
102029 5 0 0 0 102111 0
|
||||
102030 5 3 1 0 102117 0
|
||||
102031 5 0 0 0 102123 0
|
||||
102032 5 2 2 0 0 0
|
||||
102033 5 2 2 0 0 0
|
||||
0 0 0 0 0 0 0
|
||||
103001 1 2 1 0 103001 0
|
||||
103024 1 2 1 0 103070 0
|
||||
|
|
@ -100,6 +102,9 @@ int int int int int int int
|
|||
103023 5 3 2 0 103112 0
|
||||
103026 5 3 1 0 103072 0
|
||||
103027 5 0 0 0 103077 0
|
||||
103028 5 2 2 0 103126 0
|
||||
103029 5 2 2 0 103128 0
|
||||
103030 5 2 2 0 103130 0
|
||||
0 0 0 0 0 0 0
|
||||
104001 1 2 1 0 104001 0
|
||||
104031 1 2 1 0 104120 0
|
||||
|
|
|
|||
|
|
@ -633,10 +633,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
103042 0 0 null null 1 103036
|
||||
103043 0 0 null null 1 103037
|
||||
103044 0 0 null null 1 103038
|
||||
103045 0 0 null null 1 103041
|
||||
103045 0 27 5 null 1 103041
|
||||
103046 0 0 null null 0 null
|
||||
103047 0 0 null null 0 null
|
||||
103048 0 27 5 null 4 null
|
||||
103048 0 9 2 null 4 null
|
||||
103049 0 0 null null 1 103043
|
||||
103050 0 0 null null 4 null
|
||||
103051 0 1 10301 null 1 103044
|
||||
|
|
@ -833,8 +833,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
104058 0 0 null null 4 null
|
||||
104059 0 0 null null 1 104040
|
||||
104060 0 0 null 10102 1 104041
|
||||
104061 0 24 104024#104048 null 4 null
|
||||
104062 0 0 null null 4 null
|
||||
104061 0 0 null null 4 null
|
||||
104062 0 24 104024#104048 null 4 null
|
||||
104063 0 0 null null 0 null
|
||||
104064 0 0 null null 0 null
|
||||
104065 0 0 null null 0 null
|
||||
|
|
@ -873,7 +873,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2
|
|||
104098 0 0 null null 1 104071
|
||||
104099 0 1 10406 null 5 104072
|
||||
104100 0 0 null null 5 104073
|
||||
104101 0 24 104026#104048 null 4 null
|
||||
104101 0 24 104026#104091 null 4 null
|
||||
104102 0 0 null null 0 null
|
||||
104103 0 0 null null 0 null
|
||||
104104 0 0 null null 0 null
|
||||
|
|
|
|||
|
|
@ -10,6 +10,12 @@ int int mut,int#int,1 int int
|
|||
113 2 51019#51020#51021#51022#51023#51024#51025#51026#51027#51028#51029#51030#51031#51032#51033#51034#51035#51036#51037#51038#51039#51040#51041#51042#51043#51044#51045#51046#51047#51048#51049#51050#51051#51052#51053#51054#51055#51056#51057#51058#51059#51060#51061#51062#51063#51064#51065#51066#51067#51068#51069#51070#51071#51072 1 0
|
||||
114 2 51073#51074#51075#51076#51077#51078#51079#51080#51081#51082#51083#51084#51085#51086#51087#51088#51089#51090#51091#51092#51093#51094#51095#51096#51097#51098#51099#51100#51101#51102#51103#51104#51105#51106#51107#51108#51109#51110#51111#51112#51113#51114#51115#51116#51117#51118#51119#51120#51121#51122#51123#51124#51125#51126#51127#51128#51129#51130#51131#51132#51133#51134#51135#51136#51137#51138#51139#51140#51141#51142#51143#51144 1 0
|
||||
115 2 51145#51146#51147#51148#51149#51150#51151#51152#51153#51154#51155#51156#51157#51158#51159#51160#51161#51162#51163#51164#51165#51166#51167#51168#51169#51170#51171#51172#51173#51174#51175#51176#51177#51178#51179#51180#51181#51182#51183#51184#51185#51186#51187#51188#51189#51190#51191#51192#51193#51194#51195#51196#51197#51198#51199#51200#51201#51202#51203#51204#51205#51206#51207#51208#51209#51210#51211#51212#51213#51214#51215#51216 1 0
|
||||
121 1 52001 1 0
|
||||
122 1 52002 1 0
|
||||
123 1 52003 1 0
|
||||
124 1 52004 1 0
|
||||
125 1 52005 1 0
|
||||
126 1 52006 1 0
|
||||
501 2 20047#20048#20049#20050#20051#20052 1 0
|
||||
502 2 20036#20037#20039#20043 1 0
|
||||
503 2 20025#20038#20040#20041 1 0
|
||||
|
|
|
|||
|
|
@ -595,6 +595,12 @@ int int int float int int
|
|||
51214 3316 200 1.0 1 1
|
||||
51215 3317 200 1.0 1 1
|
||||
51216 3318 200 1.0 1 1
|
||||
52001 12013 100 1.0 1 1
|
||||
52002 12013 100 1.0 1 3
|
||||
52003 12013 100 1.0 2 3
|
||||
52004 12013 100 1.0 2 2
|
||||
52005 12013 100 1.0 2 4
|
||||
52006 12013 100 1.0 5 5
|
||||
20001 10001 100 1.0 1 1
|
||||
20002 10002 100 1.0 1 1
|
||||
20003 10003 100 1.0 1 1
|
||||
|
|
|
|||
|
|
@ -230,296 +230,296 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
|||
1002323 20000#0.7 14 1.55#2#1#10023#0.2 2.5
|
||||
1002324 40001#0.7 1#3#4#4 1.08#1|1#3#3|2#0.3#3#1|3#0.3#3#1 2.5
|
||||
1002325 40001#0.7 1#3#4#4 1.08#1|1#3#3|2#0.3#3#1|3#0.3#3#1 2.5
|
||||
1002411 40001#0.7 1 1.5#1 0.0
|
||||
1002412 40001#0.7 1 1.5#1 0.0
|
||||
1002413 40001#0.7 1 1.5#1 0.0
|
||||
1002414 40001#0.7 1 1.5#1 0.0
|
||||
1002415 40001#0.7 1 1.5#1 0.0
|
||||
1002421 40001#0.7 1 1.5#1 3.0
|
||||
1002422 40001#0.7 1 1.5#1 3.0
|
||||
1002423 40001#0.7 1 1.5#1 3.0
|
||||
1002424 40001#0.7 1 1.5#1 3.0
|
||||
1002425 40001#0.7 1 1.5#1 3.0
|
||||
1002511 40001#0.7 1 1.5#1 0.0
|
||||
1002512 40001#0.7 1 1.5#1 0.0
|
||||
1002513 40001#0.7 1 1.5#1 0.0
|
||||
1002514 40001#0.7 1 1.5#1 0.0
|
||||
1002515 40001#0.7 1 1.5#1 0.0
|
||||
1002521 40001#0.7 1 1.5#1 3.0
|
||||
1002522 40001#0.7 1 1.5#1 3.0
|
||||
1002523 40001#0.7 1 1.5#1 3.0
|
||||
1002524 40001#0.7 1 1.5#1 3.0
|
||||
1002525 40001#0.7 1 1.5#1 3.0
|
||||
1002611 40001#0.7 1 1.5#1 0.0
|
||||
1002612 40001#0.7 1 1.5#1 0.0
|
||||
1002613 40001#0.7 1 1.5#1 0.0
|
||||
1002614 40001#0.7 1 1.5#1 0.0
|
||||
1002615 40001#0.7 1 1.5#1 0.0
|
||||
1002621 40001#0.7 1 1.5#1 3.0
|
||||
1002622 40001#0.7 1 1.5#1 3.0
|
||||
1002623 40001#0.7 1 1.5#1 3.0
|
||||
1002624 40001#0.7 1 1.5#1 3.0
|
||||
1002625 40001#0.7 1 1.5#1 3.0
|
||||
1002711 40001#0.7 1 1.5#1 0.0
|
||||
1002712 40001#0.7 1 1.5#1 0.0
|
||||
1002713 40001#0.7 1 1.5#1 0.0
|
||||
1002714 40001#0.7 1 1.5#1 0.0
|
||||
1002715 40001#0.7 1 1.5#1 0.0
|
||||
1002721 40001#0.7 1 1.5#1 3.0
|
||||
1002722 40001#0.7 1 1.5#1 3.0
|
||||
1002723 40001#0.7 1 1.5#1 3.0
|
||||
1002724 40001#0.7 1 1.5#1 3.0
|
||||
1002725 40001#0.7 1 1.5#1 3.0
|
||||
1002811 40001#0.7 1 1.5#1 0.0
|
||||
1002812 40001#0.7 1 1.5#1 0.0
|
||||
1002813 40001#0.7 1 1.5#1 0.0
|
||||
1002814 40001#0.7 1 1.5#1 0.0
|
||||
1002815 40001#0.7 1 1.5#1 0.0
|
||||
1002821 40001#0.7 1 1.5#1 3.0
|
||||
1002822 40001#0.7 1 1.5#1 3.0
|
||||
1002823 40001#0.7 1 1.5#1 3.0
|
||||
1002824 40001#0.7 1 1.5#1 3.0
|
||||
1002825 40001#0.7 1 1.5#1 3.0
|
||||
1002911 40001#0.7 1 1.5#1 0.0
|
||||
1002912 40001#0.7 1 1.5#1 0.0
|
||||
1002913 40001#0.7 1 1.5#1 0.0
|
||||
1002914 40001#0.7 1 1.5#1 0.0
|
||||
1002915 40001#0.7 1 1.5#1 0.0
|
||||
1002921 40001#0.7 1 1.5#1 3.0
|
||||
1002922 40001#0.7 1 1.5#1 3.0
|
||||
1002923 40001#0.7 1 1.5#1 3.0
|
||||
1002924 40001#0.7 1 1.5#1 3.0
|
||||
1002925 40001#0.7 1 1.5#1 3.0
|
||||
1003011 40001#0.7 1 1.5#1 0.0
|
||||
1003012 40001#0.7 1 1.5#1 0.0
|
||||
1003013 40001#0.7 1 1.5#1 0.0
|
||||
1003014 40001#0.7 1 1.5#1 0.0
|
||||
1003015 40001#0.7 1 1.5#1 0.0
|
||||
1003021 40001#0.7 1 1.5#1 3.0
|
||||
1003022 40001#0.7 1 1.5#1 3.0
|
||||
1003023 40001#0.7 1 1.5#1 3.0
|
||||
1003024 40001#0.7 1 1.5#1 3.0
|
||||
1003025 40001#0.7 1 1.5#1 3.0
|
||||
1003111 40001#0.7 1 1.5#1 0.0
|
||||
1003112 40001#0.7 1 1.5#1 0.0
|
||||
1003113 40001#0.7 1 1.5#1 0.0
|
||||
1003114 40001#0.7 1 1.5#1 0.0
|
||||
1003115 40001#0.7 1 1.5#1 0.0
|
||||
1003121 40001#0.7 1 1.5#1 3.0
|
||||
1003122 40001#0.7 1 1.5#1 3.0
|
||||
1003123 40001#0.7 1 1.5#1 3.0
|
||||
1003124 40001#0.7 1 1.5#1 3.0
|
||||
1003125 40001#0.7 1 1.5#1 3.0
|
||||
1003211 40001#0.7 1 1.5#1 0.0
|
||||
1003212 40001#0.7 1 1.5#1 0.0
|
||||
1003213 40001#0.7 1 1.5#1 0.0
|
||||
1003214 40001#0.7 1 1.5#1 0.0
|
||||
1003215 40001#0.7 1 1.5#1 0.0
|
||||
1003221 40001#0.7 1 1.5#1 3.0
|
||||
1003222 40001#0.7 1 1.5#1 3.0
|
||||
1003223 40001#0.7 1 1.5#1 3.0
|
||||
1003224 40001#0.7 1 1.5#1 3.0
|
||||
1003225 40001#0.7 1 1.5#1 3.0
|
||||
1003311 40001#0.7 1 1.5#1 0.0
|
||||
1003312 40001#0.7 1 1.5#1 0.0
|
||||
1003313 40001#0.7 1 1.5#1 0.0
|
||||
1003314 40001#0.7 1 1.5#1 0.0
|
||||
1003315 40001#0.7 1 1.5#1 0.0
|
||||
1003321 40001#0.7 1 1.5#1 3.0
|
||||
1003322 40001#0.7 1 1.5#1 3.0
|
||||
1003323 40001#0.7 1 1.5#1 3.0
|
||||
1003324 40001#0.7 1 1.5#1 3.0
|
||||
1003325 40001#0.7 1 1.5#1 3.0
|
||||
1003411 40001#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003412 40001#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003413 40001#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003414 40001#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003415 40001#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003421 20000#0.7 1 0.97#2 3.0
|
||||
1003422 20000#0.7 1 0.97#2 3.0
|
||||
1003423 20000#0.7 1 0.97#2 3.0
|
||||
1003424 20000#0.7 1 0.97#2 3.0
|
||||
1003425 20000#0.7 1 0.97#2 3.0
|
||||
1003511 40001#0.7 1 1.5#1 0.0
|
||||
1003512 40001#0.7 1 1.5#1 0.0
|
||||
1003513 40001#0.7 1 1.5#1 0.0
|
||||
1003514 40001#0.7 1 1.5#1 0.0
|
||||
1003515 40001#0.7 1 1.5#1 0.0
|
||||
1003521 40001#0.7 1 1.5#1 3.0
|
||||
1003522 40001#0.7 1 1.5#1 3.0
|
||||
1003523 40001#0.7 1 1.5#1 3.0
|
||||
1003524 40001#0.7 1 1.5#1 3.0
|
||||
1003525 40001#0.7 1 1.5#1 3.0
|
||||
1003611 40001#0.7 1 1.5#1 0.0
|
||||
1003612 40001#0.7 1 1.5#1 0.0
|
||||
1003613 40001#0.7 1 1.5#1 0.0
|
||||
1003614 40001#0.7 1 1.5#1 0.0
|
||||
1003615 40001#0.7 1 1.5#1 0.0
|
||||
1003621 40001#0.7 1 1.5#1 3.0
|
||||
1003622 40001#0.7 1 1.5#1 3.0
|
||||
1003623 40001#0.7 1 1.5#1 3.0
|
||||
1003624 40001#0.7 1 1.5#1 3.0
|
||||
1003625 40001#0.7 1 1.5#1 3.0
|
||||
1003711 40001#0.7 1 1.5#1 0.0
|
||||
1003712 40001#0.7 1 1.5#1 0.0
|
||||
1003713 40001#0.7 1 1.5#1 0.0
|
||||
1003714 40001#0.7 1 1.5#1 0.0
|
||||
1003715 40001#0.7 1 1.5#1 0.0
|
||||
1003721 40001#0.7 1 1.5#1 3.0
|
||||
1003722 40001#0.7 1 1.5#1 3.0
|
||||
1003723 40001#0.7 1 1.5#1 3.0
|
||||
1003724 40001#0.7 1 1.5#1 3.0
|
||||
1003725 40001#0.7 1 1.5#1 3.0
|
||||
1003811 40001#0.7 1 1.5#1 0.0
|
||||
1003812 40001#0.7 1 1.5#1 0.0
|
||||
1003813 40001#0.7 1 1.5#1 0.0
|
||||
1003814 40001#0.7 1 1.5#1 0.0
|
||||
1003815 40001#0.7 1 1.5#1 0.0
|
||||
1003821 40001#0.7 1 1.5#1 3.0
|
||||
1003822 40001#0.7 1 1.5#1 3.0
|
||||
1003823 40001#0.7 1 1.5#1 3.0
|
||||
1003824 40001#0.7 1 1.5#1 3.0
|
||||
1003825 40001#0.7 1 1.5#1 3.0
|
||||
1003911 40001#0.7 1 1.5#1 0.0
|
||||
1003912 40001#0.7 1 1.5#1 0.0
|
||||
1003913 40001#0.7 1 1.5#1 0.0
|
||||
1003914 40001#0.7 1 1.5#1 0.0
|
||||
1003915 40001#0.7 1 1.5#1 0.0
|
||||
1003921 40001#0.7 1 1.5#1 3.0
|
||||
1003922 40001#0.7 1 1.5#1 3.0
|
||||
1003923 40001#0.7 1 1.5#1 3.0
|
||||
1003924 40001#0.7 1 1.5#1 3.0
|
||||
1003925 40001#0.7 1 1.5#1 3.0
|
||||
1004011 40001#0.7 1 1.5#1 0.0
|
||||
1004012 40001#0.7 1 1.5#1 0.0
|
||||
1004013 40001#0.7 1 1.5#1 0.0
|
||||
1004014 40001#0.7 1 1.5#1 0.0
|
||||
1004015 40001#0.7 1 1.5#1 0.0
|
||||
1004021 40001#0.7 1 1.5#1 3.0
|
||||
1004022 40001#0.7 1 1.5#1 3.0
|
||||
1004023 40001#0.7 1 1.5#1 3.0
|
||||
1004024 40001#0.7 1 1.5#1 3.0
|
||||
1004025 40001#0.7 1 1.5#1 3.0
|
||||
1004111 40001#0.7 1 1.5#1 0.0
|
||||
1004112 40001#0.7 1 1.5#1 0.0
|
||||
1004113 40001#0.7 1 1.5#1 0.0
|
||||
1004114 40001#0.7 1 1.5#1 0.0
|
||||
1004115 40001#0.7 1 1.5#1 0.0
|
||||
1004121 40001#0.7 1 1.5#1 3.0
|
||||
1004122 40001#0.7 1 1.5#1 3.0
|
||||
1004123 40001#0.7 1 1.5#1 3.0
|
||||
1004124 40001#0.7 1 1.5#1 3.0
|
||||
1004125 40001#0.7 1 1.5#1 3.0
|
||||
1004211 40001#0.7 1 1.5#1 0.0
|
||||
1004212 40001#0.7 1 1.5#1 0.0
|
||||
1004213 40001#0.7 1 1.5#1 0.0
|
||||
1004214 40001#0.7 1 1.5#1 0.0
|
||||
1004215 40001#0.7 1 1.5#1 0.0
|
||||
1004221 40001#0.7 1 1.5#1 3.0
|
||||
1004222 40001#0.7 1 1.5#1 3.0
|
||||
1004223 40001#0.7 1 1.5#1 3.0
|
||||
1004224 40001#0.7 1 1.5#1 3.0
|
||||
1004225 40001#0.7 1 1.5#1 3.0
|
||||
1004311 40001#0.7 1 1.5#1 0.0
|
||||
1004312 40001#0.7 1 1.5#1 0.0
|
||||
1004313 40001#0.7 1 1.5#1 0.0
|
||||
1004314 40001#0.7 1 1.5#1 0.0
|
||||
1004315 40001#0.7 1 1.5#1 0.0
|
||||
1004321 40001#0.7 1 1.5#1 3.0
|
||||
1004322 40001#0.7 1 1.5#1 3.0
|
||||
1004323 40001#0.7 1 1.5#1 3.0
|
||||
1004324 40001#0.7 1 1.5#1 3.0
|
||||
1004325 40001#0.7 1 1.5#1 3.0
|
||||
1004411 40001#0.7 1 1.5#1 0.0
|
||||
1004412 40001#0.7 1 1.5#1 0.0
|
||||
1004413 40001#0.7 1 1.5#1 0.0
|
||||
1004414 40001#0.7 1 1.5#1 0.0
|
||||
1004415 40001#0.7 1 1.5#1 0.0
|
||||
1004421 40001#0.7 1 1.5#1 3.0
|
||||
1004422 40001#0.7 1 1.5#1 3.0
|
||||
1004423 40001#0.7 1 1.5#1 3.0
|
||||
1004424 40001#0.7 1 1.5#1 3.0
|
||||
1004425 40001#0.7 1 1.5#1 3.0
|
||||
1004511 40001#0.7 1 1.5#1 0.0
|
||||
1004512 40001#0.7 1 1.5#1 0.0
|
||||
1004513 40001#0.7 1 1.5#1 0.0
|
||||
1004514 40001#0.7 1 1.5#1 0.0
|
||||
1004515 40001#0.7 1 1.5#1 0.0
|
||||
1004521 40001#0.7 1 1.5#1 3.0
|
||||
1004522 40001#0.7 1 1.5#1 3.0
|
||||
1004523 40001#0.7 1 1.5#1 3.0
|
||||
1004524 40001#0.7 1 1.5#1 3.0
|
||||
1004525 40001#0.7 1 1.5#1 3.0
|
||||
1004611 40001#0.7 1 1.5#1 0.0
|
||||
1004612 40001#0.7 1 1.5#1 0.0
|
||||
1004613 40001#0.7 1 1.5#1 0.0
|
||||
1004614 40001#0.7 1 1.5#1 0.0
|
||||
1004615 40001#0.7 1 1.5#1 0.0
|
||||
1004621 40001#0.7 1 1.5#1 3.0
|
||||
1004622 40001#0.7 1 1.5#1 3.0
|
||||
1004623 40001#0.7 1 1.5#1 3.0
|
||||
1004624 40001#0.7 1 1.5#1 3.0
|
||||
1004625 40001#0.7 1 1.5#1 3.0
|
||||
1004711 40001#0.7 1 1.5#1 0.0
|
||||
1004712 40001#0.7 1 1.5#1 0.0
|
||||
1004713 40001#0.7 1 1.5#1 0.0
|
||||
1004714 40001#0.7 1 1.5#1 0.0
|
||||
1004715 40001#0.7 1 1.5#1 0.0
|
||||
1004721 40001#0.7 1 1.5#1 3.0
|
||||
1004722 40001#0.7 1 1.5#1 3.0
|
||||
1004723 40001#0.7 1 1.5#1 3.0
|
||||
1004724 40001#0.7 1 1.5#1 3.0
|
||||
1004725 40001#0.7 1 1.5#1 3.0
|
||||
1004811 40001#0.7 1 1.5#1 0.0
|
||||
1004812 40001#0.7 1 1.5#1 0.0
|
||||
1004813 40001#0.7 1 1.5#1 0.0
|
||||
1004814 40001#0.7 1 1.5#1 0.0
|
||||
1004815 40001#0.7 1 1.5#1 0.0
|
||||
1004821 40001#0.7 1 1.5#1 3.0
|
||||
1004822 40001#0.7 1 1.5#1 3.0
|
||||
1004823 40001#0.7 1 1.5#1 3.0
|
||||
1004824 40001#0.7 1 1.5#1 3.0
|
||||
1004825 40001#0.7 1 1.5#1 3.0
|
||||
1004911 40001#0.7 1 1.5#1 0.0
|
||||
1004912 40001#0.7 1 1.5#1 0.0
|
||||
1004913 40001#0.7 1 1.5#1 0.0
|
||||
1004914 40001#0.7 1 1.5#1 0.0
|
||||
1004915 40001#0.7 1 1.5#1 0.0
|
||||
1004921 40001#0.7 1 1.5#1 3.0
|
||||
1004922 40001#0.7 1 1.5#1 3.0
|
||||
1004923 40001#0.7 1 1.5#1 3.0
|
||||
1004924 40001#0.7 1 1.5#1 3.0
|
||||
1004925 40001#0.7 1 1.5#1 3.0
|
||||
1005011 40001#0.7 1 1.5#1 0.0
|
||||
1005012 40001#0.7 1 1.5#1 0.0
|
||||
1005013 40001#0.7 1 1.5#1 0.0
|
||||
1005014 40001#0.7 1 1.5#1 0.0
|
||||
1005015 40001#0.7 1 1.5#1 0.0
|
||||
1005021 40001#0.7 1 1.5#1 3.0
|
||||
1005022 40001#0.7 1 1.5#1 3.0
|
||||
1005023 40001#0.7 1 1.5#1 3.0
|
||||
1005024 40001#0.7 1 1.5#1 3.0
|
||||
1005025 40001#0.7 1 1.5#1 3.0
|
||||
1005111 40001#0.7 1 1.5#1 0.0
|
||||
1005112 40001#0.7 1 1.5#1 0.0
|
||||
1005113 40001#0.7 1 1.5#1 0.0
|
||||
1005114 40001#0.7 1 1.5#1 0.0
|
||||
1005115 40001#0.7 1 1.5#1 0.0
|
||||
1005121 40001#0.7 1 1.5#1 3.0
|
||||
1005122 40001#0.7 1 1.5#1 3.0
|
||||
1005123 40001#0.7 1 1.5#1 3.0
|
||||
1005124 40001#0.7 1 1.5#1 3.0
|
||||
1005125 40001#0.7 1 1.5#1 3.0
|
||||
1005211 40001#0.7 1 1.5#1 0.0
|
||||
1005212 40001#0.7 1 1.5#1 0.0
|
||||
1005213 40001#0.7 1 1.5#1 0.0
|
||||
1005214 40001#0.7 1 1.5#1 0.0
|
||||
1005215 40001#0.7 1 1.5#1 0.0
|
||||
1005221 40001#0.7 1 1.5#1 3.0
|
||||
1005222 40001#0.7 1 1.5#1 3.0
|
||||
1005223 40001#0.7 1 1.5#1 3.0
|
||||
1005224 40001#0.7 1 1.5#1 3.0
|
||||
1005225 40001#0.7 1 1.5#1 3.0
|
||||
1002411 20011#0.7 1#3 0.66#1|0.6#1#5 0.0
|
||||
1002412 20011#0.7 1#3 0.825#1|0.6#1#5 0.0
|
||||
1002413 20011#0.7 1#3 1.1#1|0.6#1#5 0.0
|
||||
1002414 20011#0.7 1#3 1.1#1|0.6#1#5 0.0
|
||||
1002415 20011#0.7 1#3 1.1#1|0.6#1#5 0.0
|
||||
1002421 null null null 3.0
|
||||
1002422 null null null 3.0
|
||||
1002423 null null null 3.0
|
||||
1002424 null null null 3.0
|
||||
1002425 null null null 3.0
|
||||
1002511 20011#0.7 1#3 0.738#2|0.75#1#3 0.0
|
||||
1002512 20011#0.7 1#3 0.9225#2|0.75#1#3 0.0
|
||||
1002513 20011#0.7 1#3 1.23#2|0.75#1#3 0.0
|
||||
1002514 20011#0.7 1#3 1.23#2|0.75#1#3 0.0
|
||||
1002515 20011#0.7 1#3 1.23#2|0.75#1#3 0.0
|
||||
1002521 null null null 3.0
|
||||
1002522 null null null 3.0
|
||||
1002523 null null null 3.0
|
||||
1002524 null null null 3.0
|
||||
1002525 null null null 3.0
|
||||
1002611 20011#0.7 11#11 0.516#1#4#0.15|0.516#1#4#0.15 0.0
|
||||
1002612 20011#0.7 11#11 0.645#1#4#0.15|0.645#1#4#0.15 0.0
|
||||
1002613 20011#0.7 11#11 0.86#1#4#0.15|0.86#1#4#0.15 0.0
|
||||
1002614 20011#0.7 11#11 0.86#1#4#0.15|0.86#1#4#0.15 0.0
|
||||
1002615 20011#0.7 11#11 0.86#1#4#0.15|0.86#1#4#0.15 0.0
|
||||
1002621 20010#0.7 2 0.528#1 3.0
|
||||
1002622 20010#0.7 2 0.66#1 3.0
|
||||
1002623 20010#0.7 2 0.88#1 3.0
|
||||
1002624 20010#0.7 2 0.88#1 3.0
|
||||
1002625 20010#0.7 2 0.88#1 3.0
|
||||
1002711 20011#0.7|10011#0.7 1|24 0.576#1|1#0.36 0.0
|
||||
1002712 20011#0.7|10011#0.7 1|24 0.72#1|1#0.45 0.0
|
||||
1002713 20011#0.7|10011#0.7 1|24 0.96#1|1#0.6 0.0
|
||||
1002714 20011#0.7|10011#0.7 1|24 0.96#1|1#0.6 0.0
|
||||
1002715 20011#0.7|10011#0.7 1|24 0.96#1|1#0.6 0.0
|
||||
1002721 20012#0.7|30011#0.7 1|4 0.588#1|9#0.2#4#2 3.0
|
||||
1002722 20012#0.7|30011#0.7 1|4 0.735#1|9#0.2#4#2 3.0
|
||||
1002723 20012#0.7|30011#0.7 1|4 0.98#1|9#0.2#4#2 3.0
|
||||
1002724 20012#0.7|30011#0.7 1|4 0.98#1|9#0.2#4#2 3.0
|
||||
1002725 20012#0.7|30011#0.7 1|4 0.98#1|9#0.2#4#2 3.0
|
||||
1002811 20012#0.7 1 0.6#2 0.0
|
||||
1002812 20012#0.7 1 0.75#2 0.0
|
||||
1002813 20012#0.7 1 1#2 0.0
|
||||
1002814 20012#0.7 1 1#2 0.0
|
||||
1002815 20012#0.7 1 1#2 0.0
|
||||
1002821 20011#0.7 18 0.63#2#1 3.0
|
||||
1002822 20011#0.7 18 0.7875#2#1 3.0
|
||||
1002823 20011#0.7 18 1.05#2#1 3.0
|
||||
1002824 20011#0.7 18 1.05#2#1 3.0
|
||||
1002825 20011#0.7 18 1.05#2#1 3.0
|
||||
1002911 20011#0.7 1#1 0.552#2|0.552#2 0.0
|
||||
1002912 20011#0.7 1#1 0.69#2|0.69#2 0.0
|
||||
1002913 20011#0.7 1#1 0.92#2|0.92#2 0.0
|
||||
1002914 20011#0.7 1#1 0.92#2|0.92#2 0.0
|
||||
1002915 20011#0.7 1#1 0.92#2|0.92#2 0.0
|
||||
1002921 null null null 3.0
|
||||
1002922 null null null 3.0
|
||||
1002923 null null null 3.0
|
||||
1002924 null null null 3.0
|
||||
1002925 null null null 3.0
|
||||
1003011 20011#0.7 1#4 0.534#2|2#0.3#4#4 0.0
|
||||
1003012 20011#0.7 1#4 0.6675#2|2#0.3#4#4 0.0
|
||||
1003013 20011#0.7 1#4 0.89#2|2#0.3#4#4 0.0
|
||||
1003014 20011#0.7 1#4 0.89#2|2#0.3#4#4 0.0
|
||||
1003015 20011#0.7 1#4 0.89#2|2#0.3#4#4 0.0
|
||||
1003021 null null null 3.0
|
||||
1003022 null null null 3.0
|
||||
1003023 null null null 3.0
|
||||
1003024 null null null 3.0
|
||||
1003025 null null null 3.0
|
||||
1003111 20011#0.7 11#11 0.456#1#3#0.2|0.456#1#3#0.3 0.0
|
||||
1003112 20011#0.7 11#11 0.57#1#3#0.2|0.57#1#3#0.3 0.0
|
||||
1003113 20011#0.7 11#11 0.76#1#3#0.2|0.76#1#3#0.3 0.0
|
||||
1003114 20011#0.7 11#11 0.76#1#3#0.2|0.76#1#3#0.3 0.0
|
||||
1003115 20011#0.7 11#11 0.76#1#3#0.2|0.76#1#3#0.3 0.0
|
||||
1003121 null null null 3.0
|
||||
1003122 null null null 3.0
|
||||
1003123 null null null 3.0
|
||||
1003124 null null null 3.0
|
||||
1003125 null null null 3.0
|
||||
1003211 20011#0.7 1#13 0.516#1|1#0.12#1#4 0.0
|
||||
1003212 20011#0.7 1#13 0.645#1|1#0.15#1#4 0.0
|
||||
1003213 20011#0.7 1#13 0.86#1|1#0.2#1#4 0.0
|
||||
1003214 20011#0.7 1#13 0.86#1|1#0.2#1#4 0.0
|
||||
1003215 20011#0.7 1#13 0.86#1|1#0.2#1#4 0.0
|
||||
1003221 null null null 3.0
|
||||
1003222 null null null 3.0
|
||||
1003223 null null null 3.0
|
||||
1003224 null null null 3.0
|
||||
1003225 null null null 3.0
|
||||
1003311 20011#0.7 1#1 0.624#1|0.624#1 0.0
|
||||
1003312 20011#0.7 1#1 0.78#1|0.78#1 0.0
|
||||
1003313 20011#0.7 1#1 1.04#1|1.04#1 0.0
|
||||
1003314 20011#0.7 1#1 1.04#1|1.04#1 0.0
|
||||
1003315 20011#0.7 1#1 1.04#1|1.04#1 0.0
|
||||
1003321 null null null 3.0
|
||||
1003322 null null null 3.0
|
||||
1003323 null null null 3.0
|
||||
1003324 null null null 3.0
|
||||
1003325 null null null 3.0
|
||||
1003411 20011#0.7 1#3 0.63#2|0.3#1#4 0
|
||||
1003412 20011#0.7 1#3 0.7875#2|0.3#1#4 0
|
||||
1003413 20011#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003414 20011#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003415 20011#0.7 1#3 1.05#2|0.3#1#4 0
|
||||
1003421 20010#0.7 2 0.582#2 3.0
|
||||
1003422 20010#0.7 2 0.7275#2 3.0
|
||||
1003423 20010#0.7 2 0.97#2 3.0
|
||||
1003424 20010#0.7 2 0.97#2 3.0
|
||||
1003425 20010#0.7 2 0.97#2 3.0
|
||||
1003511 20011#0.7 11#11#11 0.468#1#1#0.2|0.468#1#1#0.2|0.468#1#1#0.2 0.0
|
||||
1003512 20011#0.7 11#11#11 0.585#1#1#0.2|0.585#1#1#0.2|0.585#1#1#0.2 0.0
|
||||
1003513 20011#0.7 11#11#11 0.78#1#1#0.2|0.78#1#1#0.2|0.78#1#1#0.2 0.0
|
||||
1003514 20011#0.7 11#11#11 0.78#1#1#0.2|0.78#1#1#0.2|0.78#1#1#0.2 0.0
|
||||
1003515 20011#0.7 11#11#11 0.78#1#1#0.2|0.78#1#1#0.2|0.78#1#1#0.2 0.0
|
||||
1003521 20111#0.7 2 0.72#1 3.0
|
||||
1003522 20111#0.7 2 0.9#1 3.0
|
||||
1003523 20111#0.7 2 1.2#1 3.0
|
||||
1003524 20111#0.7 2 1.2#1 3.0
|
||||
1003525 20111#0.7 2 1.2#1 3.0
|
||||
1003611 20011#0.7 11#11 0.528#2#4#0.2|0.528#2#4#0.2 0.0
|
||||
1003612 20011#0.7 11#11 0.66#2#4#0.2|0.66#2#4#0.2 0.0
|
||||
1003613 20011#0.7 11#11 0.88#2#4#0.2|0.88#2#4#0.2 0.0
|
||||
1003614 20011#0.7 11#11 0.88#2#4#0.2|0.88#2#4#0.2 0.0
|
||||
1003615 20011#0.7 11#11 0.88#2#4#0.2|0.88#2#4#0.2 0.0
|
||||
1003621 null null null 3.0
|
||||
1003622 null null null 3.0
|
||||
1003623 null null null 3.0
|
||||
1003624 null null null 3.0
|
||||
1003625 null null null 3.0
|
||||
1003711 20011#0.7|30011#0.7 1|4#4 0.516#1|2#0.3#3#2|3#0.3#3#2 0.0
|
||||
1003712 20011#0.7|30011#0.7 1|4#4 0.645#1|2#0.3#3#2|3#0.3#3#2 0.0
|
||||
1003713 20011#0.7|30011#0.7 1|4#4 0.86#1|2#0.3#3#2|3#0.3#3#2 0.0
|
||||
1003714 20011#0.7|30011#0.7 1|4#4 0.86#1|2#0.3#3#2|3#0.3#3#2 0.0
|
||||
1003715 20011#0.7|30011#0.7 1|4#4 0.86#1|2#0.3#3#2|3#0.3#3#2 0.0
|
||||
1003721 null null null 3.0
|
||||
1003722 null null null 3.0
|
||||
1003723 null null null 3.0
|
||||
1003724 null null null 3.0
|
||||
1003725 null null null 3.0
|
||||
1003811 20011#0.7 1#4#4 0.594#2|2#0.3#3#4|3#0.3#3#4 0.0
|
||||
1003812 20011#0.7 1#4#4 0.7425#2|2#0.3#3#4|3#0.3#3#4 0.0
|
||||
1003813 20011#0.7 1#4#4 0.99#2|2#0.3#3#4|3#0.3#3#4 0.0
|
||||
1003814 20011#0.7 1#4#4 0.99#2|2#0.3#3#4|3#0.3#3#4 0.0
|
||||
1003815 20011#0.7 1#4#4 0.99#2|2#0.3#3#4|3#0.3#3#4 0.0
|
||||
1003821 null null null 3.0
|
||||
1003822 null null null 3.0
|
||||
1003823 null null null 3.0
|
||||
1003824 null null null 3.0
|
||||
1003825 null null null 3.0
|
||||
1003911 20011#0.7 2#4 0.588#1|3#0.4#3#4 0.0
|
||||
1003912 20011#0.7 2#4 0.735#1|3#0.4#3#4 0.0
|
||||
1003913 20011#0.7 2#4 0.98#1|3#0.4#3#4 0.0
|
||||
1003914 20011#0.7 2#4 0.98#1|3#0.4#3#4 0.0
|
||||
1003915 20011#0.7 2#4 0.98#1|3#0.4#3#4 0.0
|
||||
1003921 null null null 3.0
|
||||
1003922 null null null 3.0
|
||||
1003923 null null null 3.0
|
||||
1003924 null null null 3.0
|
||||
1003925 null null null 3.0
|
||||
1004011 20011#0.7 11#11 0.516#1#5#0.2|0.516#1#5#0.2 0.0
|
||||
1004012 20011#0.7 11#11 0.645#1#5#0.2|0.645#1#5#0.2 0.0
|
||||
1004013 20011#0.7 11#11 0.86#1#5#0.2|0.86#1#5#0.2 0.0
|
||||
1004014 20011#0.7 11#11 0.86#1#5#0.2|0.86#1#5#0.2 0.0
|
||||
1004015 20011#0.7 11#11 0.86#1#5#0.2|0.86#1#5#0.2 0.0
|
||||
1004021 null null null 3.0
|
||||
1004022 null null null 3.0
|
||||
1004023 null null null 3.0
|
||||
1004024 null null null 3.0
|
||||
1004025 null null null 3.0
|
||||
1004111 20011#0.7 10 0.72#1#0.8 0.0
|
||||
1004112 20011#0.7 10 0.9#1#0.8 0.0
|
||||
1004113 20011#0.7 10 1.2#1#0.8 0.0
|
||||
1004114 20011#0.7 10 1.2#1#0.8 0.0
|
||||
1004115 20011#0.7 10 1.2#1#0.8 0.0
|
||||
1004121 null null null 3.0
|
||||
1004122 null null null 3.0
|
||||
1004123 null null null 3.0
|
||||
1004124 null null null 3.0
|
||||
1004125 null null null 3.0
|
||||
1004211 20011#0.7 1#1 0.564#1|0.564#1 0.0
|
||||
1004212 20011#0.7 1#1 0.705#1|0.705#1 0.0
|
||||
1004213 20011#0.7 1#1 0.94#1|0.94#1 0.0
|
||||
1004214 20011#0.7 1#1 0.94#1|0.94#1 0.0
|
||||
1004215 20011#0.7 1#1 0.94#1|0.94#1 0.0
|
||||
1004221 null null null 3.0
|
||||
1004222 null null null 3.0
|
||||
1004223 null null null 3.0
|
||||
1004224 null null null 3.0
|
||||
1004225 null null null 3.0
|
||||
1004311 20011#0.7 1#13 0.624#1|2#0.15#1#3 0.0
|
||||
1004312 20011#0.7 1#13 0.78#1|2#0.1875#1#3 0.0
|
||||
1004313 20011#0.7 1#13 1.04#1|2#0.25#1#3 0.0
|
||||
1004314 20011#0.7 1#13 1.04#1|2#0.25#1#3 0.0
|
||||
1004315 20011#0.7 1#13 1.04#1|2#0.25#1#3 0.0
|
||||
1004321 null null null 3.0
|
||||
1004322 null null null 3.0
|
||||
1004323 null null null 3.0
|
||||
1004324 null null null 3.0
|
||||
1004325 null null null 3.0
|
||||
1004411 20012#0.7 11 0.516#2#3#0.2 0.0
|
||||
1004412 20012#0.7 11 0.645#2#3#0.2 0.0
|
||||
1004413 20012#0.7 11 0.86#2#3#0.2 0.0
|
||||
1004414 20012#0.7 11 0.86#2#3#0.2 0.0
|
||||
1004415 20012#0.7 11 0.86#2#3#0.2 0.0
|
||||
1004421 20013#0.7 28 0.588#2#0#0.1 3.0
|
||||
1004422 20013#0.7 28 0.735#2#0#0.1 3.0
|
||||
1004423 20013#0.7 28 0.98#2#0#0.1 3.0
|
||||
1004424 20013#0.7 28 0.98#2#0#0.1 3.0
|
||||
1004425 20013#0.7 28 0.98#2#0#0.1 3.0
|
||||
1004511 20011#0.7|10111#0.7 1|24 0.516#2|1#0.72 0.0
|
||||
1004512 20011#0.7|10111#0.7 1|24 0.645#2|1#0.9 0.0
|
||||
1004513 20011#0.7|10111#0.7 1|24 0.86#2|1#1.2 0.0
|
||||
1004514 20011#0.7|10111#0.7 1|24 0.86#2|1#1.2 0.0
|
||||
1004515 20011#0.7|10111#0.7 1|24 0.86#2|1#1.2 0.0
|
||||
1004521 null null null 3.0
|
||||
1004522 null null null 3.0
|
||||
1004523 null null null 3.0
|
||||
1004524 null null null 3.0
|
||||
1004525 null null null 3.0
|
||||
1004611 20012#0.7 1 0.6#2 0.0
|
||||
1004612 20012#0.7 1 0.75#2 0.0
|
||||
1004613 20012#0.7 1 1#2 0.0
|
||||
1004614 20012#0.7 1 1#2 0.0
|
||||
1004615 20012#0.7 1 1#2 0.0
|
||||
1004621 20011#0.7 1#13 0.72#2|3#0.18#2#4 3.0
|
||||
1004622 20011#0.7 1#13 0.9#2|3#0.225#2#4 3.0
|
||||
1004623 20011#0.7 1#13 1.2#2|3#0.3#2#4 3.0
|
||||
1004624 20011#0.7 1#13 1.2#2|3#0.3#2#4 3.0
|
||||
1004625 20011#0.7 1#13 1.2#2|3#0.3#2#4 3.0
|
||||
1004711 20012#0.7 1 0.456#1 0.0
|
||||
1004712 20012#0.7 1 0.57#1 0.0
|
||||
1004713 20012#0.7 1 0.76#1 0.0
|
||||
1004714 20012#0.7 1 0.76#1 0.0
|
||||
1004715 20012#0.7 1 0.76#1 0.0
|
||||
1004721 null null null 3.0
|
||||
1004722 null null null 3.0
|
||||
1004723 null null null 3.0
|
||||
1004724 null null null 3.0
|
||||
1004725 null null null 3.0
|
||||
1004811 20011#0.7 1 0.522#1 0.0
|
||||
1004812 20011#0.7 1 0.6525#1 0.0
|
||||
1004813 20011#0.7 1 0.87#1 0.0
|
||||
1004814 20011#0.7 1 0.87#1 0.0
|
||||
1004815 20011#0.7 1 0.87#1 0.0
|
||||
1004821 null null null 3.0
|
||||
1004822 null null null 3.0
|
||||
1004823 null null null 3.0
|
||||
1004824 null null null 3.0
|
||||
1004825 null null null 3.0
|
||||
1004911 20011#0.7 1 0.54#1 0.0
|
||||
1004912 20011#0.7 1 0.675#1 0.0
|
||||
1004913 20011#0.7 1 0.9#1 0.0
|
||||
1004914 20011#0.7 1 0.9#1 0.0
|
||||
1004915 20011#0.7 1 0.9#1 0.0
|
||||
1004921 null null null 3.0
|
||||
1004922 null null null 3.0
|
||||
1004923 null null null 3.0
|
||||
1004924 null null null 3.0
|
||||
1004925 null null null 3.0
|
||||
1005011 20012#0.7 1 0.444#2 0.0
|
||||
1005012 20012#0.7 1 0.555#2 0.0
|
||||
1005013 20012#0.7 1 0.74#2 0.0
|
||||
1005014 20012#0.7 1 0.74#2 0.0
|
||||
1005015 20012#0.7 1 0.74#2 0.0
|
||||
1005021 null null null 3.0
|
||||
1005022 null null null 3.0
|
||||
1005023 null null null 3.0
|
||||
1005024 null null null 3.0
|
||||
1005025 null null null 3.0
|
||||
1005111 20011#0.7 1 0.522#2 0.0
|
||||
1005112 20011#0.7 1 0.6525#2 0.0
|
||||
1005113 20011#0.7 1 0.87#2 0.0
|
||||
1005114 20011#0.7 1 0.87#2 0.0
|
||||
1005115 20011#0.7 1 0.87#2 0.0
|
||||
1005121 null null null 3.0
|
||||
1005122 null null null 3.0
|
||||
1005123 null null null 3.0
|
||||
1005124 null null null 3.0
|
||||
1005125 null null null 3.0
|
||||
1005211 20011#0.7 1 0.582#2 0.0
|
||||
1005212 20011#0.7 1 0.7275#2 0.0
|
||||
1005213 20011#0.7 1 0.97#2 0.0
|
||||
1005214 20011#0.7 1 0.97#2 0.0
|
||||
1005215 20011#0.7 1 0.97#2 0.0
|
||||
1005221 null null null 3.0
|
||||
1005222 null null null 3.0
|
||||
1005223 null null null 3.0
|
||||
1005224 null null null 3.0
|
||||
1005225 null null null 3.0
|
||||
20001 20013#0.7 1 0.45#1 0.0
|
||||
20002 20013#0.7 1 0.45#1 0.0
|
||||
20003 20013#0.7 1 0.45#1 0.0
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ function BattleMain.Execute(seed, fightData, optionData)
|
|||
|
||||
print(PrintTable(fightData))
|
||||
--该开关用于输出战斗过程中的日志，用于验证前后端是否出现战斗不同步
|
||||
BattleLogic.IsOpenBattleRecord = true
|
||||
BattleLogic.IsOpenBattleRecord = false
|
||||
|
||||
if xpcall(function ()
|
||||
Random.SetSeed(seed)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
package com.ljsd.jieling.config;
|
||||
|
||||
import com.ljsd.jieling.logic.STableManager;
|
||||
import com.ljsd.jieling.logic.Table;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Table(name ="AccomplishmentBox")
|
||||
public class SAccomplishmentBox implements BaseConfig {
|
||||
|
||||
private int id;
|
||||
|
||||
private int total;
|
||||
|
||||
private int[][] box;
|
||||
|
||||
private Map<Integer,Integer> boxMap;
|
||||
private static Map<Integer, SAccomplishmentBox> sAccomplishmentBoxMap;
|
||||
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
Map<Integer, SAccomplishmentBox> config = STableManager.getConfig(SAccomplishmentBox.class);
|
||||
for(SAccomplishmentBox sAccomplishmentBox : config.values()){
|
||||
int[][] box = sAccomplishmentBox.getBox();
|
||||
Map<Integer,Integer> boxMapTmp = new HashMap<>();
|
||||
for(int [] boxItem : box){
|
||||
boxMapTmp.put(boxItem[0],boxItem[1]);
|
||||
}
|
||||
sAccomplishmentBox.setBoxMap(boxMapTmp);
|
||||
}
|
||||
sAccomplishmentBoxMap = config;
|
||||
}
|
||||
|
||||
public static SAccomplishmentBox getsAccomplishmentBoxByMapId( int mapId ) {
|
||||
return sAccomplishmentBoxMap.get(mapId);
|
||||
}
|
||||
|
||||
public int getid() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getTotal() {
|
||||
return total;
|
||||
}
|
||||
|
||||
public int[][] getBox() {
|
||||
return box;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getBoxMap() {
|
||||
return boxMap;
|
||||
}
|
||||
|
||||
public void setBoxMap(Map<Integer, Integer> boxMap) {
|
||||
this.boxMap = boxMap;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
package com.ljsd.jieling.config;
|
||||
|
||||
import com.ljsd.jieling.logic.STableManager;
|
||||
import com.ljsd.jieling.logic.Table;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Table(name ="AccomplishmentConfig")
|
||||
public class SAccomplishmentConfig implements BaseConfig {
|
||||
|
||||
private int id;
|
||||
|
||||
private int mapId;
|
||||
|
||||
private int logic;
|
||||
|
||||
private int[] values;
|
||||
|
||||
private int score;
|
||||
|
||||
private static Map<Integer, List<SAccomplishmentConfig>> sAccomplishmentConfigByMapIdMap;
|
||||
|
||||
private static Map<Integer, SAccomplishmentConfig> sAccomplishmentConfigByIdMap;
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
Map<Integer, SAccomplishmentConfig> config = STableManager.getConfig(SAccomplishmentConfig.class);
|
||||
Map<Integer, List<SAccomplishmentConfig>> sAccomplishmentConfigByMapIdMapTmp = new HashMap<>();
|
||||
for(SAccomplishmentConfig sAccomplishmentConfig : config.values()){
|
||||
int mapId = sAccomplishmentConfig.getMapId();
|
||||
if(!sAccomplishmentConfigByMapIdMapTmp.containsKey(mapId)){
|
||||
sAccomplishmentConfigByMapIdMapTmp.put(mapId,new ArrayList<>());
|
||||
}
|
||||
sAccomplishmentConfigByMapIdMapTmp.get(mapId).add(sAccomplishmentConfig);
|
||||
}
|
||||
sAccomplishmentConfigByMapIdMap = sAccomplishmentConfigByMapIdMapTmp;
|
||||
sAccomplishmentConfigByIdMap = config;
|
||||
}
|
||||
|
||||
public static List<SAccomplishmentConfig> getsAccomplishmentConfigByMapId(int mapId) {
|
||||
return sAccomplishmentConfigByMapIdMap.get(mapId);
|
||||
}
|
||||
|
||||
public static SAccomplishmentConfig getsAccomplishmentConfigByIdMap(int id) {
|
||||
return sAccomplishmentConfigByIdMap.get(id);
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getMapId() {
|
||||
return mapId;
|
||||
}
|
||||
|
||||
public int getLogic() {
|
||||
return logic;
|
||||
}
|
||||
|
||||
public int[] getValues() {
|
||||
return values;
|
||||
}
|
||||
|
||||
public int getScore() {
|
||||
return score;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -81,4 +81,9 @@ public class EventType {
|
|||
public static final int openAppointMission = 26;
|
||||
public static final int openNotDoMission = 27;
|
||||
|
||||
|
||||
public static final int updateEvent = 1;
|
||||
public static final int fightEvent = 2;
|
||||
public static final int shopEvent = 3;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
package com.ljsd.jieling.handler.map;
|
||||
|
||||
import com.ljsd.jieling.handler.BaseHandler;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class GetMapAccoumpHandler extends BaseHandler {
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.GET_ALL_MAP_ACCOMPLISH_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
MapLogic.getInstance().getMapMisionDetail(iSession);
|
||||
}
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@ import com.ljsd.jieling.handler.map.behavior.BaseBehavior;
|
|||
import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
|
||||
import com.ljsd.jieling.handler.mission.Mission;
|
||||
import com.ljsd.jieling.logic.dao.Hero;
|
||||
import com.ljsd.jieling.logic.dao.MailManager;
|
||||
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
|
@ -102,23 +103,25 @@ public class MapLogic {
|
|||
} else {
|
||||
Map<Integer, SCMap> scMap = SCMap.sCMap.get(mapId);
|
||||
if (scMap == null) {
|
||||
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
// if (mapId > mapManager.getMaxMapId()) {
|
||||
// return;
|
||||
// }
|
||||
// SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapId);
|
||||
// if (energy < scMapConfig.getEnergyConfused()) {
|
||||
// LOGGER.info("enterMap() uid=>{} energy=>{} need=>{} energy not enough ", uid, energy, scMapConfig.getEnergyConfused());
|
||||
// MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
|
||||
// return;
|
||||
// }
|
||||
// int leftEnergy = energy - scMapConfig.getEnergyConfused();
|
||||
// user.getPlayerInfoManager().setEnergy(leftEnergy);
|
||||
// if (mapId != mapManager.getCurMapId()) {
|
||||
// initMap(mapManager, user);
|
||||
// user.setMapManager(mapManager);
|
||||
// }
|
||||
if (mapId > mapManager.getCurMapId()) {
|
||||
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapId);
|
||||
if (energy < scMapConfig.getEnergyConfused()) {
|
||||
LOGGER.info("enterMap() uid=>{} energy=>{} need=>{} energy not enough ", uid, energy, scMapConfig.getEnergyConfused());
|
||||
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
int leftEnergy = energy - scMapConfig.getEnergyConfused();
|
||||
user.getPlayerInfoManager().setEnergy(leftEnergy);
|
||||
if (mapId != mapManager.getCurMapId()) {
|
||||
initMap(mapManager, user);
|
||||
user.setMapManager(mapManager);
|
||||
}
|
||||
}
|
||||
List<CommonProto.Cell> cells = new ArrayList<>(mapManager.getMapInfo().size());
|
||||
for (Map.Entry<Integer, Cell> entry : mapManager.getMapInfo().entrySet()) {
|
||||
|
|
@ -237,6 +240,7 @@ public class MapLogic {
|
|||
}
|
||||
mapManager.setMapInfo(newMap);
|
||||
mapManager.setTypeEight(spicelMap);
|
||||
initMapMission(mapManager);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -370,6 +374,7 @@ public class MapLogic {
|
|||
return;
|
||||
}
|
||||
mapManager.setTotalStep(mapManager.getTotalStep() - mapPointConfig.getConfused());
|
||||
updateMapMission(mapManager,EventType.updateEvent,MapMissionType.CONSUME_ACTION_POWER_EVENT.getMissionTypeValue(),mapPointConfig.getConfused());
|
||||
}
|
||||
int behaviorType = sOptionConfig.getBehaviorType();
|
||||
int[][] behaviorTypeValues = sOptionConfig.getBehaviorTypeValues();
|
||||
|
|
@ -473,6 +478,7 @@ public class MapLogic {
|
|||
// LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
|
||||
// cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon);
|
||||
saveRefreshInfo(optionId, mapManager, mapPointConfig, nextEventId);
|
||||
updateMapMission(mapManager,EventType.updateEvent,eventId,0);
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||
}
|
||||
|
||||
|
|
@ -635,13 +641,15 @@ public class MapLogic {
|
|||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
MapManager mapManager = user.getMapManager();
|
||||
MapMission mapMission = mapManager.getAllMissionProgress().get(mapManager.getCurMapId());
|
||||
if (mapManager.getMapInfo() == null) {
|
||||
LOGGER.info("mapManager.getMapInfo() == null");
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
MapInfoProto.MapOutResponse build = MapInfoProto.MapOutResponse.newBuilder().setMapAccomplishInfo(CBean2Proto.getMapAccomplishInfo(mapManager.getAllMissionProgress().get(mapManager.getCurMapId()))).build();
|
||||
resetMapInfo(user, true);
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), build, true);
|
||||
}
|
||||
|
||||
public void resetMapInfo(User user, boolean needTemporaryItem) throws Exception {
|
||||
|
|
@ -770,7 +778,6 @@ public class MapLogic {
|
|||
}else if(resultCode == 0){
|
||||
// 失败处理
|
||||
resetMapInfo(user,true);
|
||||
|
||||
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
|
||||
FightInfoProto.FightEndResponse fightEndResponse = FightInfoProto.FightEndResponse
|
||||
.newBuilder()
|
||||
|
|
@ -796,6 +803,7 @@ public class MapLogic {
|
|||
.setResult(resultCode)
|
||||
.addAllRemainHpList(remainHp)
|
||||
.build();
|
||||
updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId);
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true);
|
||||
|
||||
|
||||
|
|
@ -811,4 +819,187 @@ public class MapLogic {
|
|||
crossMapCell.getDayRefreshs().clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void initMapMission( MapManager mapManager){
|
||||
int mapId = mapManager.getCurMapId();
|
||||
if(mapManager.getAllMissionProgress().containsKey(mapId)){
|
||||
return;
|
||||
}
|
||||
List<SAccomplishmentConfig> sAccomplishmentConfigs = SAccomplishmentConfig.getsAccomplishmentConfigByMapId(mapId);
|
||||
|
||||
Map<Integer,Integer> missionProgress = new HashMap<>();
|
||||
for(SAccomplishmentConfig sAccomplishmentConfig : sAccomplishmentConfigs){
|
||||
int id = sAccomplishmentConfig.getId();
|
||||
missionProgress.put(id,0);
|
||||
}
|
||||
MapMission mapMission = new MapMission(mapId,missionProgress);
|
||||
mapManager.addMapMission(mapMission);
|
||||
}
|
||||
|
||||
|
||||
public void updateMapMission(MapManager mapManager,int eventType,int eventId,int bossIdOrItemId){
|
||||
int mapId = mapManager.getCurMapId();
|
||||
MapMission mapMission = mapManager.getAllMissionProgress().get(mapId);
|
||||
int addScore=0;
|
||||
Map<Integer, Integer> allMissionProgress = mapMission.getAllMissionProgress();
|
||||
boolean needUpdate = false;
|
||||
for(Map.Entry<Integer,Integer> missionItem : allMissionProgress.entrySet()){
|
||||
Integer missionId = missionItem.getKey();
|
||||
Integer missionValue = missionItem.getValue();
|
||||
SAccomplishmentConfig sAccomplishmentConfig = SAccomplishmentConfig.getsAccomplishmentConfigByIdMap(missionId);
|
||||
int score = sAccomplishmentConfig.getScore();
|
||||
int logic = sAccomplishmentConfig.getLogic();
|
||||
int[] values = sAccomplishmentConfig.getValues();
|
||||
int targetEventId = values[0];
|
||||
int targetEventValue = values[1];
|
||||
if(logic == MapMissionType.FINISH_EVEVNT.getMissionTypeValue()){
|
||||
if(targetEventId == eventId){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+1);
|
||||
needUpdate = true;
|
||||
if(missionValue+1 == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//updateEvent optionalConfig获取
|
||||
if(eventType == EventType.updateEvent){
|
||||
if(logic == eventId){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+bossIdOrItemId);
|
||||
needUpdate = true;
|
||||
if(missionValue+bossIdOrItemId == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(logic == MapMissionType.DIGGER_EVENT.getMissionTypeValue()){
|
||||
MapPointConfig mapPointConfig = MapPointConfig.getScMapEventMap().get(eventId);
|
||||
if(mapPointConfig!=null&&mapPointConfig.getStyle() == 2){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+1);
|
||||
needUpdate = true;
|
||||
if(missionValue+1 == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//todo 战斗结束处理
|
||||
if(eventType == EventType.fightEvent){
|
||||
if(logic == MapMissionType.KILL_BOSS.getMissionTypeValue()){
|
||||
if(targetEventId == bossIdOrItemId){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+1);
|
||||
needUpdate = true;
|
||||
if(missionValue+1 == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(logic == MapMissionType.VICTORY_EVENT.getMissionTypeValue()){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+1);
|
||||
needUpdate = true;
|
||||
if(missionValue+1 == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//todo 行脚商人 在地图商店买东西需要特殊处理
|
||||
if(eventType == EventType.shopEvent){
|
||||
if(logic == MapMissionType.BUY_GOODS_ID_EVENT.getMissionTypeValue()){
|
||||
if(targetEventId == eventId && bossIdOrItemId == targetEventValue && missionValue==0 ){
|
||||
allMissionProgress.put(missionId,1);
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
|
||||
if(logic == MapMissionType.BUY_GOODS_TYPE_EVENT.getMissionTypeValue()){
|
||||
if(targetEventId == eventId && missionValue==0 ){
|
||||
SItem sItem = SItem.getsItemMap().get(bossIdOrItemId);
|
||||
if(sItem.getItemType() == targetEventValue){
|
||||
allMissionProgress.put(missionId,1);
|
||||
needUpdate = true;
|
||||
addScore+=score;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//todo 开宝箱
|
||||
if(logic == MapMissionType.OPEN_BOX.getMissionTypeValue()){
|
||||
if(missionValue<targetEventValue){
|
||||
allMissionProgress.put(missionId,missionValue+1);
|
||||
needUpdate = true;
|
||||
if(missionValue+1 == targetEventValue){
|
||||
addScore+=score;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(addScore!=0){
|
||||
mapMission.setTotalWeight(mapMission.getTotalWeight()+addScore);
|
||||
}
|
||||
if(needUpdate){
|
||||
mapMission.setAllMissionProgress(allMissionProgress);
|
||||
}
|
||||
}
|
||||
|
||||
public void getMapMisionDetail(ISession session) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
MapManager mapManager = user.getMapManager();
|
||||
Map<Integer, MapMission> allMapMissionProgress = mapManager.getAllMissionProgress();
|
||||
if(allMapMissionProgress == null || allMapMissionProgress.isEmpty()){
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ALL_MAP_ACCOMPLISH_RESPONSE_VALUE,null,true);
|
||||
return;
|
||||
}
|
||||
List<CommonProto.MapAccomplishInfo> mapAccomplishInfos = new ArrayList<>(allMapMissionProgress.size());
|
||||
for(MapMission mapMission : allMapMissionProgress.values()){
|
||||
mapAccomplishInfos.add( CBean2Proto.getMapAccomplishInfo(mapMission));
|
||||
}
|
||||
|
||||
MapInfoProto.GetMapAccomplishResponse build = MapInfoProto.GetMapAccomplishResponse.newBuilder().addAllMapAccomplishInfo(mapAccomplishInfos).build();
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_ALL_MAP_ACCOMPLISH_RESPONSE_VALUE,build,true);
|
||||
}
|
||||
|
||||
|
||||
public void takeMissionBoxReward(ISession session,int mapId,int boxWeight) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
MapManager mapManager = user.getMapManager();
|
||||
MapMission mapMission = mapManager.getAllMissionProgress().get(mapId);
|
||||
if(mapMission == null ){
|
||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.TAKE_MAP_MISSION_BOX_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
SAccomplishmentBox sAccomplishmentBox = SAccomplishmentBox.getsAccomplishmentBoxByMapId(mapId);
|
||||
int totalWeight = mapMission.getTotalWeight();
|
||||
Integer rewaedGroupId = sAccomplishmentBox.getBoxMap().get(boxWeight);
|
||||
if(rewaedGroupId == null || totalWeight < boxWeight ){
|
||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.TAKE_MAP_MISSION_BOX_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
if(mapMission.getHadTakeRewardIds().contains(boxWeight)){
|
||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.TAKE_MAP_MISSION_BOX_RESPONSE_VALUE,"hadTaked");
|
||||
return;
|
||||
}
|
||||
mapMission.getHadTakeRewardIds().add(boxWeight);
|
||||
mapMission.setHadTakeRewardIds(mapMission.getHadTakeRewardIds());
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[]{rewaedGroupId}, 1.0f, 0);
|
||||
MapInfoProto.TakeMapBoxResponse build = MapInfoProto.TakeMapBoxResponse.newBuilder().setDrop(drop).build();
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MAP_MISSION_BOX_RESPONSE_VALUE,build,true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ package com.ljsd.jieling.handler.map;
|
|||
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.jieling.config.SAccomplishmentConfig;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import org.springframework.data.mongodb.core.mapping.Field;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
|
@ -35,6 +37,8 @@ public class MapManager extends MongoBase {
|
|||
|
||||
private List<FoodBuffer> foodBuffers = new ArrayList();
|
||||
|
||||
private Map<Integer, MapMission> allMissionProgress = new ConcurrentHashMap<>();
|
||||
|
||||
public MapManager() {
|
||||
this.setRootCollection(User._COLLECTION_NAME);
|
||||
}
|
||||
|
|
@ -188,4 +192,14 @@ public class MapManager extends MongoBase {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
public Map<Integer, MapMission> getAllMissionProgress() {
|
||||
return allMissionProgress;
|
||||
}
|
||||
|
||||
public void addMapMission(MapMission mapMission) {
|
||||
mapMission.init(this.getRootId(),getMongoKey() + ".allMissionProgress." + mapMission.getMapId());
|
||||
updateString( "allMissionProgress." + mapMission.getMapId(), mapMission);
|
||||
allMissionProgress.put(mapMission.getMapId(),mapMission);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
package com.ljsd.jieling.handler.map;
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
public class MapMission extends MongoBase {
|
||||
|
||||
private int mapId;
|
||||
|
||||
private Map<Integer,Integer> allMissionProgress;
|
||||
|
||||
private Set<Integer> hadTakeRewardIds;
|
||||
|
||||
private int totalWeight;
|
||||
|
||||
public int getMapId() {
|
||||
return mapId;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getAllMissionProgress() {
|
||||
return allMissionProgress;
|
||||
}
|
||||
|
||||
public MapMission(){}
|
||||
|
||||
public MapMission(int mapId, Map<Integer, Integer> missionProgress) {
|
||||
this.setRootCollection(User._COLLECTION_NAME);
|
||||
this.mapId = mapId;
|
||||
this.allMissionProgress = missionProgress;
|
||||
this.hadTakeRewardIds = new HashSet<>();
|
||||
}
|
||||
|
||||
|
||||
public void setMapId(int mapId) {
|
||||
this.mapId = mapId;
|
||||
}
|
||||
|
||||
public void setAllMissionProgress(Map<Integer, Integer> allMissionProgress) {
|
||||
updateString("allMissionProgress",allMissionProgress);
|
||||
this.allMissionProgress = allMissionProgress;
|
||||
}
|
||||
|
||||
public Set<Integer> getHadTakeRewardIds() {
|
||||
return hadTakeRewardIds;
|
||||
}
|
||||
|
||||
public void setTotalWeight(int totalWeight) {
|
||||
updateString("totalWeight",totalWeight);
|
||||
this.totalWeight = totalWeight;
|
||||
}
|
||||
|
||||
public int getTotalWeight() {
|
||||
return totalWeight;
|
||||
}
|
||||
|
||||
public void setHadTakeRewardIds(Set<Integer> hadTakeRewardIds) {
|
||||
updateString("hadTakeRewardIds",hadTakeRewardIds);
|
||||
this.hadTakeRewardIds = hadTakeRewardIds;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package com.ljsd.jieling.handler.map;
|
||||
|
||||
public enum MapMissionType {
|
||||
FINISH_EVEVNT(1), //完成事件点
|
||||
KILL_BOSS(2), //击杀boss多少次
|
||||
VICTORY_EVENT(3), //本次地图获得战斗胜利次数
|
||||
BUY_GOODS_ID_EVENT(4), //在本图行脚商人购买某物
|
||||
DIGGER_EVENT(5), //本地图采矿都少次
|
||||
COLLECT_GOODS_ID_EVENT(6), //在收集商人那边兑换出来物品
|
||||
CONSUME_ACTION_POWER_EVENT(7), //在本次地图内消耗多少行动力
|
||||
OPEN_BOX(8), //在本次地图内消耗多少行动力
|
||||
BUY_GOODS_TYPE_EVENT(9); //在本图行脚商人购买某类物品
|
||||
|
||||
private int missionType;
|
||||
|
||||
MapMissionType(int missionType) {
|
||||
this.missionType = missionType;
|
||||
}
|
||||
|
||||
public int getMissionTypeValue() {
|
||||
return missionType;
|
||||
}
|
||||
|
||||
public static MapMissionType getMissionTypeById(int missionId) {
|
||||
MapMissionType[] values = MapMissionType.values();
|
||||
for(MapMissionType missionType : values){
|
||||
if(missionType.getMissionTypeValue() == missionId){
|
||||
return missionType;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
package com.ljsd.jieling.handler.map;
|
||||
|
||||
import com.ljsd.jieling.handler.BaseHandler;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class TakeMapBoxRewardHandler extends BaseHandler {
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.TAKE_MAP_MISSION_BOX_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
byte[] bytes = netData.parseClientProtoNetData();
|
||||
MapInfoProto.TakeMapBoxRequest takeMapBoxRequest = MapInfoProto.TakeMapBoxRequest.parseFrom(bytes);
|
||||
int boxWeight = takeMapBoxRequest.getBoxWeight();
|
||||
int mapId = takeMapBoxRequest.getMapId();
|
||||
MapLogic.getInstance().takeMissionBoxReward(iSession,mapId,boxWeight);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
package com.ljsd.jieling.logic.dao;
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.jieling.db.mongo.MongoKey;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
|
||||
|
|
@ -13,6 +12,8 @@ public class AdventureManager extends MongoBase {
|
|||
private Map<Integer,AdventureStateInfo> adventureStateInfoMap;
|
||||
private Map<Integer,Integer> allowTimeMap;
|
||||
|
||||
private long updateTime;
|
||||
|
||||
public AdventureManager(){
|
||||
this.setRootCollection(User._COLLECTION_NAME);
|
||||
adventureStateInfoMap = new HashMap<>();
|
||||
|
|
@ -30,7 +31,7 @@ public class AdventureManager extends MongoBase {
|
|||
public void clearStation(int position){
|
||||
AdventureStateInfo adventureStateInfo = adventureStateInfoMap.get(position);
|
||||
if (adventureStateInfo!=null){
|
||||
removeString("adventureStateInfoMap." + position);
|
||||
removeString(getMongoKey() +".adventureStateInfoMap." + position);
|
||||
adventureStateInfoMap.remove(position);
|
||||
}
|
||||
|
||||
|
|
@ -49,6 +50,20 @@ public class AdventureManager extends MongoBase {
|
|||
allowTimeMap.put(position,allowTime);
|
||||
}
|
||||
|
||||
public void setUpdateTime(long updateTime) {
|
||||
updateString("updateTime.",updateTime);
|
||||
this.updateTime = updateTime;
|
||||
}
|
||||
|
||||
public void setAllowTimeMap(Map<Integer, Integer> allowTimeMap) {
|
||||
updateString("allowTimeMap.",allowTimeMap);
|
||||
this.allowTimeMap = allowTimeMap;
|
||||
}
|
||||
|
||||
public long getUpdateTime() {
|
||||
return updateTime;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getAllowTimeMap() {
|
||||
return allowTimeMap;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ public class CombatLogic {
|
|||
public void getAdventureStateInfo(ISession session) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
flushAdventureTime(user);
|
||||
AdventureManager adventureManager = user.getAdventureManager();
|
||||
Map<Integer, AdventureStateInfo> adventureStateInfoMap = adventureManager.getAdventureStateInfoMap();
|
||||
List<CommonProto.AdventureStateInfo> result = new ArrayList<>();
|
||||
|
|
@ -208,11 +209,33 @@ public class CombatLogic {
|
|||
}
|
||||
|
||||
adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()/1000),hourDuration,totalForce,myRecommendHeroSize),allowTime);
|
||||
if(adventureManager.getUpdateTime() == 0){
|
||||
adventureManager.setUpdateTime(System.currentTimeMillis());
|
||||
}
|
||||
|
||||
//发送成功
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,null,true);
|
||||
}
|
||||
|
||||
private void flushAdventureTime( User user ){
|
||||
AdventureManager adventureManager = user.getAdventureManager();
|
||||
long updateTime = adventureManager.getUpdateTime();
|
||||
if(updateTime ==0 || TimeUtils.isSameDayWithNow(updateTime)){
|
||||
return;
|
||||
}
|
||||
int vipLevel = user.getPlayerInfoManager().getVipLevel();
|
||||
int allowTime = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel).getPrivilegeMap().get(1);
|
||||
Map<Integer, Integer> allowTimeMap = adventureManager.getAllowTimeMap();
|
||||
if(allowTimeMap!=null && !allowTimeMap.isEmpty()){
|
||||
Map<Integer,Integer> result = new HashMap<>();
|
||||
for(Integer position : allowTimeMap.keySet()){
|
||||
result.put(position,allowTime);
|
||||
}
|
||||
adventureManager.setUpdateTime(System.currentTimeMillis());
|
||||
adventureManager.setAllowTimeMap(result);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void clearStation(ISession session,int position) throws Exception {
|
||||
int uid = session.getUid();
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.ljsd.jieling.util;
|
|||
import com.ljsd.jieling.config.SGameSetting;
|
||||
import com.ljsd.jieling.config.SMonsterConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.handler.map.MapMission;
|
||||
import com.ljsd.jieling.handler.map.TemporaryItems;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
|
|
@ -84,9 +85,12 @@ public class CBean2Proto {
|
|||
if(adventureStateInfo!=null){
|
||||
int startTime = adventureStateInfo.getStartTime();
|
||||
int now = (int)(System.currentTimeMillis()/1000);
|
||||
int hourDuration = adventureStateInfo.getHourDuration();
|
||||
int remainTime = startTime + hourDuration*60*60 - now;
|
||||
remainTime = remainTime<0?0:remainTime;
|
||||
builder.addAllHeroIdList(adventureStateInfo.getHeroIds())
|
||||
.setHourDuration(adventureStateInfo.getHourDuration())
|
||||
.setRemainTime((now - startTime ));
|
||||
.setHourDuration(hourDuration)
|
||||
.setRemainTime(remainTime);
|
||||
}
|
||||
return builder.build();
|
||||
|
||||
|
|
@ -187,4 +191,20 @@ public class CBean2Proto {
|
|||
monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId()));
|
||||
return monsterBuilder.build();
|
||||
}
|
||||
|
||||
public static CommonProto.MapAccomplishInfo getMapAccomplishInfo(MapMission mapMission){
|
||||
int totalWeight = mapMission.getTotalWeight();
|
||||
Map<Integer, Integer> allMissionProgress = mapMission.getAllMissionProgress();
|
||||
List<CommonProto.ExploreDetail> exploreDetailList = new ArrayList<>();
|
||||
for(Map.Entry<Integer,Integer> missionItem : allMissionProgress.entrySet()){
|
||||
exploreDetailList.add(CommonProto.ExploreDetail.newBuilder().setId(missionItem.getKey())
|
||||
.setProgress(missionItem.getValue())
|
||||
.build());
|
||||
}
|
||||
int mapId = mapMission.getMapId();
|
||||
return CommonProto.MapAccomplishInfo.newBuilder() .setMapId(mapId)
|
||||
.addAllExploreDetail(exploreDetailList)
|
||||
.setTotalWeight(totalWeight)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue