back_recharge
mashiyu 2019-03-28 15:00:01 +08:00
commit 76d045cc3d
7 changed files with 285 additions and 270 deletions

View File

@ -19,7 +19,7 @@ int int int int int int int
101022 2 2 2 0 101130 0
101015 2 3 2 0 101134 0
101021 2 3 2 0 101129 0
101005 3 2 2 0 101005 0
101005 3 2 2 0 101005 30
101006 4 2 2 0 101153 0
0 0 0 0 0 0 0
101008 5 3 2 0 101006 0

View File

@ -11,7 +11,7 @@ int mut,int#int,2 mut,int#int,1 string
10108 11#4#6 10108#20108
10109 11#7#9 10109#20109
10110 11 10110#20110
10111 136#137#138 10104#20104
10111 136#137#138 10111#20111
10201 16#17#18 10201#20201
10202 20#16#18 10202#20202
10203 23#16#18 10203#20203
@ -29,8 +29,8 @@ int mut,int#int,2 mut,int#int,1 string
10405 44#34#36 10405#20405
10406 44#37#39 10406#20406
10407 44 10407#20407
10408 43#45 10409#20409
10409 43#45#40#42 10408#20408
10408 43#45 10408#20408
10409 43#45#40#42 10409#20409
10501 46#48 10501#20501
10502 46#47#48 10502#20502
10503 50#46#48 10503#20503
@ -72,56 +72,56 @@ int mut,int#int,2 mut,int#int,1 string
11004 122#125#128 11004#21004
11005 122 11005#21005
11006 131 11006#21006
1010001 1002#1003#1004 10104#20104
1010002 1005#1006#1007 10105#20105
1010003 1008#1009#1010 10106#20106
1010004 1011#1012#1013 10107#20107
1010005 1014#1016 10107#20107
1010006 1014#1015#1016 10107#20107
1010007 1017 10110#20110
1020001 1018#1019#1020 10201#20201
1020002 1021#1022#1023 10201#20201
1020003 1024#1025#1026 10201#20201
1020004 1027#1028#1029 10201#20201
1020005 1030#1031#1032 10201#20201
1020006 1033#1034#1035 10202#20202
1020007 1036#1037#1038 10203#20203
1020008 1039#1040#1041 10204#20204
1020009 1042 10205#20205
1030001 1043#1044#1045 10302#20302
1030002 1046#1047#1048 10303#20303
1030003 1052#1049#1051 10304#20304
1030004 1053 10305#20305
1040001 1054#1055#1056 10404#20404
1040002 1057#1058#1059 10404#20404
1040003 1060#1061#1062 10405#20405
1040004 1063 10406#20406
1040005 1063#1064#1060#1062 10407#20407
1040006 1065#1066#1067 10409#20409
1050001 1069 10501#20501
1050002 1071#1072#1073 10502#20502
1050003 1075#1071#1073 10503#20503
1050004 1078 10504#20504
1050005 1080 10504#20504
1050006 1081#1082 10504#20504
1060001 1083#1084#1085 10601#20601
1060002 1086#1087#1088 10601#20601
1060003 1089#1090#1091 10601#20601
1060004 1092 10602#20602
1060005 1093#1094#1095 10603#20603
1060006 1096#1097#1098 10604#20604
1060007 1099#1101#1102#1104 10605#20605
1070001 1108#1110#1105#1107 10708#20708
1070002 1111 10709#20709
1080001 1112#1114 10808#20808
1080002 1115#1117 10808#20808
1080003 1118#1120 10808#20808
1080004 1121#1123 10808#20808
1080005 1124#1126 10808#20808
1080006 1127#1129 10808#20808
1080007 1130#1131 10809#20809
1080008 1132 10809#20809
1080009 1133 10809#20809
1090001 1134#1135#1136 10906#20906
1090002 1137#1138#1139 10906#20906
1090003 1140 10907#20907
1010001 1002#1003#1004 1010001#1020001
1010002 1005#1006#1007 1010002#1020002
1010003 1008#1009#1010 1010003#1020003
1010004 1011#1012#1013 1010004#1020004
1010005 1014#1016 1010005#1020005
1010006 1014#1015#1016 1010006#1020006
1010007 1017 1010007#1020007
1020001 1018#1019#1020 1020001#1030001
1020002 1021#1022#1023 1020002#1030002
1020003 1024#1025#1026 1020003#1030003
1020004 1027#1028#1029 1020004#1030004
1020005 1030#1031#1032 1020005#1030005
1020006 1033#1034#1035 1020006#1030006
1020007 1036#1037#1038 1020007#1030007
1020008 1039#1040#1041 1020008#1030008
1020009 1042 1020009#1030009
1030001 1043#1044#1045 1030001#1040001
1030002 1046#1047#1048 1030002#1040002
1030003 1052#1049#1051 1030003#1040003
1030004 1053 1030004#1040004
1040001 1054#1055#1056 1040001#1050001
1040002 1057#1058#1059 1040002#1050002
1040003 1060#1061#1062 1040003#1050003
1040004 1063 1040004#1050004
1040005 1063#1064#1060#1062 1040005#1050005
1040006 1065#1066#1067 1040006#1050006
1050001 1069 1050001#1060001
1050002 1071#1072#1073 1050002#1060002
1050003 1075#1071#1073 1050003#1060003
1050004 1078 1050004#1060004
1050005 1080 1050005#1060005
1050006 1081#1082 1050006#1060006
1060001 1083#1084#1085 1060001#1070001
1060002 1086#1087#1088 1060002#1070002
1060003 1089#1090#1091 1060003#1070003
1060004 1092 1060004#1070004
1060005 1093#1094#1095 1060005#1070005
1060006 1096#1097#1098 1060006#1070006
1060007 1099#1101#1102#1104 1060007#1070007
1070001 1108#1110#1105#1107 1070001#1080001
1070002 1111 1070002#1080002
1080001 1112#1114 1080001#1090001
1080002 1115#1117 1080002#1090002
1080003 1118#1120 1080003#1090003
1080004 1121#1123 1080004#1090004
1080005 1124#1126 1080005#1090005
1080006 1127#1129 1080006#1090006
1080007 1130#1131 1080007#1090007
1080008 1132 1080008#1090008
1080009 1133 1080009#1090009
1090001 1134#1135#1136 1090001#1100001
1090002 1137#1138#1139 1090002#1100002
1090003 1140 1090003#1100003

View File

@ -207,67 +207,68 @@ int int mut,int#int,1 int int
10107 1 1006#2006 2 0
10108 1 1007#2007 2 0
10109 1 1008#2008 2 0
10110 1 1009#2009#103 2 0
10201 1 1010#2010 2 0
10202 1 1011#2011 2 0
10203 1 1012#2012 2 0
10204 1 1013#2013 2 0
10205 1 1014#2014 2 0
10301 1 1015#2015 2 0
10302 1 1016#2016 2 0
10303 1 1017#2017 2 0
10304 1 1018#2018 2 0
10305 1 1019#2019 2 0
10401 1 1020#2020 2 0
10402 1 1021#2021 2 0
10403 1 1022#2022 2 0
10404 1 1023#2023 2 0
10405 1 1024#2024 2 0
10406 1 1025#2025 2 0
10407 1 1026#2026 2 0
10408 1 1027#2027 2 0
10409 1 1069#2069 2 0
10501 1 1028#2028 2 0
10502 1 1029#2029 2 0
10503 1 1030#2030 2 0
10504 1 1031#2031 2 0
10505 1 1032#2032 2 0
10601 1 1033#2033 2 0
10602 1 1034#2034 2 0
10603 1 1035#2035 2 0
10604 1 1036#2036 2 0
10605 1 1037#2037 2 0
10701 1 1038#2038 2 0
10702 1 1039#2039 2 0
10703 1 1040#2040 2 0
10704 1 1041#2041 2 0
10705 1 1042#2042 2 0
10706 1 1043#2043 2 0
10707 1 1044#2044 2 0
10708 1 1045#2045 2 0
10709 1 1046#2046 2 0
10801 1 1047#2047 2 0
10802 1 1048#2048 2 0
10803 1 1049#2049 2 0
10804 1 1050#2050 2 0
10805 1 1051#2051 2 0
10806 1 1052#2052 2 0
10807 1 1053#2053 2 0
10808 1 1054#2054 2 0
10809 1 1055#2055 2 0
10901 1 1056#2056 2 0
10902 1 1057#2057 2 0
10903 1 1058#2058 2 0
10904 1 1059#2059 2 0
10905 1 1060#2060 2 0
10906 1 1061#2061 2 0
10907 1 1062#2062 2 0
11001 1 1063#2063 2 0
11002 1 1064#2064 2 0
11003 1 1065#2065 2 0
11004 1 1066#2066 2 0
11005 1 1067#2067 2 0
11006 1 1068#2068 2 0
10110 1 1009#2009 2 0
10111 1 1010#2010 2 0
10201 1 1011#2011 2 0
10202 1 1012#2012 2 0
10203 1 1013#2013 2 0
10204 1 1014#2014 2 0
10205 1 1015#2015 2 0
10301 1 1016#2016 2 0
10302 1 1017#2017 2 0
10303 1 1018#2018 2 0
10304 1 1019#2019 2 0
10305 1 1020#2020 2 0
10401 1 1021#2021 2 0
10402 1 1022#2022 2 0
10403 1 1023#2023 2 0
10404 1 1024#2024 2 0
10405 1 1025#2025 2 0
10406 1 1026#2026 2 0
10407 1 1027#2027 2 0
10408 1 1028#2028 2 0
10409 1 1029#2029 2 0
10501 1 1030#2030 2 0
10502 1 1031#2031 2 0
10503 1 1032#2032 2 0
10504 1 1033#2033 2 0
10505 1 1034#2034 2 0
10601 1 1035#2035 2 0
10602 1 1036#2036 2 0
10603 1 1037#2037 2 0
10604 1 1038#2038 2 0
10605 1 1039#2039 2 0
10701 1 1040#2040 2 0
10702 1 1041#2041 2 0
10703 1 1042#2042 2 0
10704 1 1043#2043 2 0
10705 1 1044#2044 2 0
10706 1 1045#2045 2 0
10707 1 1046#2046 2 0
10708 1 1047#2047 2 0
10709 1 1048#2048 2 0
10801 1 1049#2049 2 0
10802 1 1050#2050 2 0
10803 1 1051#2051 2 0
10804 1 1052#2052 2 0
10805 1 1053#2053 2 0
10806 1 1054#2054 2 0
10807 1 1055#2055 2 0
10808 1 1056#2056 2 0
10809 1 1057#2057 2 0
10901 1 1058#2058 2 0
10902 1 1059#2059 2 0
10903 1 1060#2060 2 0
10904 1 1061#2061 2 0
10905 1 1062#2062 2 0
10906 1 1063#2063 2 0
10907 1 1064#2064 2 0
11001 1 1065#2065 2 0
11002 1 1066#2066 2 0
11003 1 1067#2067 2 0
11004 1 1068#2068 2 0
11005 1 1069#2069 2 0
11006 1 1070#2070 2 0
20101 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20102 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20103 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
@ -278,6 +279,7 @@ int int mut,int#int,1 int int
20108 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20109 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20110 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20111 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20201 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20202 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20203 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
@ -296,7 +298,7 @@ int int mut,int#int,1 int int
20406 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20407 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20408 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20409 2 100#201#202#203#204#205#206#207#208#209#210#211#212#213#214#215#216#217#218 1 0
20409 2 100#101#102#103#104#105#106#107#108#109#110#111#112#113#114#115#116#117#118 1 0
20501 2 100#201#202#203#204#205#206#207#208#209#210#211#212#213#214#215#216#217#218 1 0
20502 2 100#201#202#203#204#205#206#207#208#209#210#211#212#213#214#215#216#217#218 1 0
20503 2 100#201#202#203#204#205#206#207#208#209#210#211#212#213#214#215#216#217#218 1 0
@ -338,9 +340,6 @@ int int mut,int#int,1 int int
21004 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0
21005 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0
21006 2 100#301#302#303#304#305#306#307#308#309#310#311#312#313#314#315#316#317#318 1 0
0 0 null 0 0
0 0 null 0 0
0 0 null 0 0
100001 1 100001 1 0
100002 1 100002 1 0
100003 1 100003 1 0

View File

@ -73,146 +73,148 @@ int int int float int int
416 3316 100 1.0 1 1
417 3317 100 1.0 1 1
418 3318 100 1.0 1 1
1000 3 100 1.0 3 7
1001 3 100 1.0 3 7
1002 3 100 1.0 3 7
1003 3 100 1.0 3 7
1004 3 100 1.0 3 7
1005 3 100 1.0 3 7
1006 3 100 1.0 3 7
1007 3 100 1.0 3 7
1008 3 100 1.0 3 7
1009 3 100 1.0 150 150
1010 3 100 1.0 3 7
1011 3 100 1.0 3 7
1012 3 100 1.0 8 12
1013 3 100 1.0 3 7
1014 3 100 1.0 300 300
1015 3 100 1.0 8 12
1016 3 100 1.0 8 12
1017 3 100 1.0 8 12
1018 3 100 1.0 8 12
1019 3 100 1.0 160 160
1020 3 100 1.0 8 12
1021 3 100 1.0 8 12
1022 3 100 1.0 8 12
1023 3 100 1.0 8 12
1024 3 100 1.0 13 17
1025 3 100 1.0 13 17
1026 3 100 1.0 170 170
1027 3 100 1.0 18 22
1028 3 100 1.0 8 12
1029 3 100 1.0 13 17
1030 3 100 1.0 13 17
1031 3 100 1.0 180 180
1032 3 100 1.0 350 350
1033 3 100 1.0 13 17
1034 3 100 1.0 13 17
1035 3 100 1.0 13 17
1036 3 100 1.0 190 190
1037 3 100 1.0 400 400
1038 3 100 1.0 13 17
1039 3 100 1.0 13 17
1040 3 100 1.0 13 17
1041 3 100 1.0 13 17
1042 3 100 1.0 13 17
1043 3 100 1.0 3 7
1044 3 100 1.0 13 17
1045 3 100 1.0 200 200
1046 3 100 1.0 450 450
1047 3 100 1.0 13 17
1048 3 100 1.0 13 17
1049 3 100 1.0 13 17
1050 3 100 1.0 13 17
1051 3 100 1.0 8 12
1052 3 100 1.0 13 17
1053 3 100 1.0 13 17
1054 3 100 1.0 210 210
1055 3 100 1.0 500 500
1056 3 100 1.0 13 17
1057 3 100 1.0 13 17
1058 3 100 1.0 13 17
1059 3 100 1.0 13 17
1060 3 100 1.0 18 22
1061 3 100 1.0 220 220
1062 3 100 1.0 550 550
1063 3 100 1.0 18 22
1064 3 100 1.0 23 27
1065 3 100 1.0 23 27
1066 3 100 1.0 28 32
1067 3 100 1.0 13 17
1068 3 100 1.0 600 600
1069 3 100 1.0 700 700
2000 14 100 1.0 120 160
2001 14 100 1.0 120 160
2002 14 100 1.0 120 160
2003 14 100 1.0 120 160
2004 14 100 1.0 120 160
2005 14 100 1.0 120 160
2006 14 100 1.0 140 180
2007 14 100 1.0 140 180
2008 14 100 1.0 140 180
2009 14 100 1.0 300 300
2010 14 100 1.0 180 220
2011 14 100 1.0 180 220
2012 14 100 1.0 210 250
2013 14 100 1.0 300 300
2014 14 100 1.0 500 500
2015 14 100 1.0 260 300
2016 14 100 1.0 260 300
2017 14 100 1.0 300 340
2018 14 100 1.0 300 340
2019 14 100 1.0 400 400
2020 14 100 1.0 260 300
2021 14 100 1.0 260 300
2022 14 100 1.0 260 300
2023 14 100 1.0 260 300
2024 14 100 1.0 300 340
2025 14 100 1.0 300 340
2026 14 100 1.0 450 450
2027 14 100 1.0 430 470
2028 14 100 1.0 210 250
2029 14 100 1.0 310 350
2030 14 100 1.0 360 400
2031 14 100 1.0 500 500
2032 14 100 1.0 700 700
2033 14 100 1.0 310 350
2034 14 100 1.0 310 350
2035 14 100 1.0 360 400
2036 14 100 1.0 600 600
2037 14 100 1.0 800 800
2038 14 100 1.0 320 360
2039 14 100 1.0 320 360
2040 14 100 1.0 320 360
2041 14 100 1.0 320 360
2042 14 100 1.0 370 410
2043 14 100 1.0 100 140
2044 14 100 1.0 370 410
2045 14 100 1.0 650 650
2046 14 100 1.0 888 888
2047 14 100 1.0 320 360
2048 14 100 1.0 320 360
2049 14 100 1.0 320 360
2050 14 100 1.0 320 360
2051 14 100 1.0 220 260
2052 14 100 1.0 370 410
2053 14 100 1.0 320 360
2054 14 100 1.0 600 600
2055 14 100 1.0 1000 1000
2056 14 100 1.0 370 410
2057 14 100 1.0 370 410
2058 14 100 1.0 370 410
2059 14 100 1.0 370 410
2060 14 100 1.0 430 470
2061 14 100 1.0 700 700
2062 14 100 1.0 1500 1500
2063 14 100 1.0 320 360
2064 14 100 1.0 370 410
2065 14 100 1.0 370 410
2066 14 100 1.0 470 510
2067 14 100 1.0 200 240
2068 14 100 1.0 800 800
2069 14 100 1.0 1600 1600
1000 3 100 1.0 18 22
1001 3 100 1.0 14 17
1002 3 100 1.0 14 17
1003 3 100 1.0 14 17
1004 3 100 1.0 14 17
1005 3 100 1.0 14 17
1006 3 100 1.0 18 22
1007 3 100 1.0 18 22
1008 3 100 1.0 18 22
1009 3 100 1.0 100 100
1010 3 100 1.0 100 100
1011 3 100 1.0 18 22
1012 3 100 1.0 18 22
1013 3 100 1.0 23 28
1014 3 100 1.0 150 150
1015 3 100 1.0 300 300
1016 3 100 1.0 23 28
1017 3 100 1.0 23 28
1018 3 100 1.0 27 33
1019 3 100 1.0 36 44
1020 3 100 1.0 150 150
1021 3 100 1.0 32 39
1022 3 100 1.0 32 39
1023 3 100 1.0 32 39
1024 3 100 1.0 32 39
1025 3 100 1.0 36 44
1026 3 100 1.0 36 44
1027 3 100 1.0 150 150
1028 3 100 1.0 400 400
1029 3 100 1.0 400 400
1030 3 100 1.0 27 33
1031 3 100 1.0 41 50
1032 3 100 1.0 45 55
1033 3 100 1.0 200 200
1034 3 100 1.0 500 500
1035 3 100 1.0 41 50
1036 3 100 1.0 41 50
1037 3 100 1.0 45 55
1038 3 100 1.0 250 250
1039 3 100 1.0 600 600
1040 3 100 1.0 45 55
1041 3 100 1.0 45 55
1042 3 100 1.0 45 55
1043 3 100 1.0 45 55
1044 3 100 1.0 54 66
1045 3 100 1.0 18 22
1046 3 100 1.0 54 66
1047 3 100 1.0 300 300
1048 3 100 1.0 700 700
1049 3 100 1.0 45 55
1050 3 100 1.0 45 55
1051 3 100 1.0 45 55
1052 3 100 1.0 45 55
1053 3 100 1.0 32 39
1054 3 100 1.0 54 66
1055 3 100 1.0 45 55
1056 3 100 1.0 350 350
1057 3 100 1.0 800 800
1058 3 100 1.0 54 66
1059 3 100 1.0 54 66
1060 3 100 1.0 54 66
1061 3 100 1.0 54 66
1062 3 100 1.0 63 77
1063 3 100 1.0 400 400
1064 3 100 1.0 900 900
1065 3 100 1.0 81 99
1066 3 100 1.0 90 110
1067 3 100 1.0 90 110
1068 3 100 1.0 117 143
1069 3 100 1.0 50 61
1070 3 100 1.0 1000 1000
2000 14 100 1.0 522 638
2001 14 100 1.0 450 550
2002 14 100 1.0 450 550
2003 14 100 1.0 450 550
2004 14 100 1.0 450 550
2005 14 100 1.0 450 550
2006 14 100 1.0 522 638
2007 14 100 1.0 522 638
2008 14 100 1.0 522 638
2009 14 100 1.0 306 374
2010 14 100 1.0 603 737
2011 14 100 1.0 603 737
2012 14 100 1.0 603 737
2013 14 100 1.0 693 847
2014 14 100 1.0 423 517
2015 14 100 1.0 963 1177
2016 14 100 1.0 837 1023
2017 14 100 1.0 837 1023
2018 14 100 1.0 963 1177
2019 14 100 1.0 963 1177
2020 14 100 1.0 423 517
2021 14 100 1.0 837 1023
2022 14 100 1.0 837 1023
2023 14 100 1.0 837 1023
2024 14 100 1.0 837 1023
2025 14 100 1.0 963 1177
2026 14 100 1.0 963 1177
2027 14 100 1.0 540 660
2028 14 100 1.0 1080 1320
2029 14 100 1.0 1782 2178
2030 14 100 1.0 756 924
2031 14 100 1.0 1080 1320
2032 14 100 1.0 1242 1518
2033 14 100 1.0 540 660
2034 14 100 1.0 1080 1320
2035 14 100 1.0 1080 1320
2036 14 100 1.0 1080 1320
2037 14 100 1.0 1242 1518
2038 14 100 1.0 594 726
2039 14 100 1.0 1359 1661
2040 14 100 1.0 1179 1441
2041 14 100 1.0 1179 1441
2042 14 100 1.0 1179 1441
2043 14 100 1.0 1179 1441
2044 14 100 1.0 1359 1661
2045 14 100 1.0 414 506
2046 14 100 1.0 1359 1661
2047 14 100 1.0 594 726
2048 14 100 1.0 594 726
2049 14 100 1.0 1179 1441
2050 14 100 1.0 1179 1441
2051 14 100 1.0 1179 1441
2052 14 100 1.0 1179 1441
2053 14 100 1.0 828 1012
2054 14 100 1.0 1359 1661
2055 14 100 1.0 1179 1441
2056 14 100 1.0 702 858
2057 14 100 1.0 2304 2816
2058 14 100 1.0 1395 1705
2059 14 100 1.0 1395 1705
2060 14 100 1.0 1395 1705
2061 14 100 1.0 1395 1705
2062 14 100 1.0 1611 1969
2063 14 100 1.0 612 748
2064 14 100 1.0 711 869
2065 14 100 1.0 1413 1727
2066 14 100 1.0 1602 1958
2067 14 100 1.0 1602 1958
2068 14 100 1.0 2070 2530
2069 14 100 1.0 900 1100
2070 14 100 1.0 1710 2090
6000 14 100 1.0 88888 88888
6001 3001 100 1.0 1 1
6002 3003 100 1.0 1 1
@ -677,7 +679,7 @@ int int int float int int
100019 14 100 1.0 0 0
100020 14 100 1.0 0 0
101001 4 100 1.0 10 10
101002 4 100 1.0 30 3
101002 4 100 1.0 30 30
101003 4 100 1.0 50 50
101004 4 100 1.0 80 80
101005 4 100 1.0 100 100

View File

@ -244,11 +244,15 @@ public class MapLogic {
}
public boolean updateMapByOnlyConsumeActionPower(ISession session, int curXY,int triggerXY, List<Integer> cells,MessageTypeProto.MessageType messageType) throws Exception {
if(triggerXY == -1){
if(triggerXY == -1000){
int uid = session.getUid();
User user = UserManager.getUser(uid);
MapManager mapManager = user.getMapManager();
SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapManager.getCurMapId());
if( null == scMapConfig ){
MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
return true;
}
int moveConfused = scMapConfig.getMoveConfused();
if (moveConfused > 0) {
int leftStep = mapManager.getTotalStep() - cells.size() * moveConfused;

View File

@ -35,11 +35,20 @@ public class CBean2Proto {
return player;
}
public static CommonProto.Item getItem(Item item){
/**
*
* @param item
* @param itemNum -1
* @return
*/
public static CommonProto.Item getItem(Item item,int itemNum){
if(itemNum == -1){
itemNum = item.getItemNum();
}
CommonProto.Item itemProto = CommonProto.Item
.newBuilder()
.setItemId(item.getItemId())
.setItemNum(item.getItemNum())
.setItemNum(itemNum)
.setEndingTime(item.getEndingTime())
.build();
return itemProto;
@ -113,7 +122,7 @@ public class CBean2Proto {
public static CommonProto.Drop getDrop(TemporaryItems temporaryItems) {
CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder();
for (Item item : temporaryItems.items.values()) {
drop.addItemlist(getItem(item));
drop.addItemlist(getItem(item,-1));
}
for (Equip equip : temporaryItems.equips) {
drop.addEquipId(getEquipProto(equip));

View File

@ -97,6 +97,7 @@ public class ItemUtil {
addCard(user,cardMap,dropBuilder);
return dropBuilder;
}
private static void selectItemArr(int[][] itemArr, Map<Integer, Integer> cardMap, Map<Integer, Integer>
itemMap,Map<Integer,Integer> equipMap,Map<Integer,Integer> randomMap) {
for (int[] items : itemArr){
@ -257,7 +258,7 @@ public class ItemUtil {
} else {
item.setItemNum(item.getItemNum() + entry.getValue());
}
itemProtoList.add(CBean2Proto.getItem(item));
itemProtoList.add(CBean2Proto.getItem(item,entry.getValue()));
}
if (dropBuilder != null) {
dropBuilder.addAllItemlist(itemProtoList);
@ -294,7 +295,7 @@ public class ItemUtil {
} else {
item.setItemNum(item.getItemNum() + entry.getValue());
}
itemProtoList.add(CBean2Proto.getItem(item));
itemProtoList.add(CBean2Proto.getItem(item,entry.getValue()));
}
Set<Equip> equips = temporaryItems.equips;
for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
@ -399,7 +400,7 @@ public class ItemUtil {
Map<Integer, Item> itemMap = itemManager.getItemMap();
if (itemMap.size() !=0 ){
for (Map.Entry<Integer, Item> entry :itemMap.entrySet()){
itemList.add(CBean2Proto.getItem(entry.getValue()));
itemList.add(CBean2Proto.getItem(entry.getValue(),-1));
}
}
return itemList;