Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
a52dfcf6d7
|
@ -7,4 +7,6 @@
|
|||
*.lock
|
||||
serverlogic/src/main/java/com/ljsd/jieling/protocols
|
||||
*.class
|
||||
out
|
||||
build
|
||||
out
|
Binary file not shown.
|
@ -1,3 +0,0 @@
|
|||
Manifest-Version: 1.0
|
||||
Main-Class: com.ljsd.jieling.CommonApplication
|
||||
|
|
@ -30,30 +30,38 @@ int mut,int#int,1
|
|||
101028 101033
|
||||
101029 101034
|
||||
101030 101035
|
||||
101029 101036#101037
|
||||
101030 101036#101037
|
||||
101031 101036#101037
|
||||
101032 101036#101037
|
||||
101033 101036#101037
|
||||
101034 null
|
||||
101035 null
|
||||
101036 null
|
||||
101037 null
|
||||
101038 null
|
||||
101039 null
|
||||
101040 null
|
||||
101041 null
|
||||
101042 null
|
||||
101043 null
|
||||
101044 null
|
||||
101045 null
|
||||
101046 null
|
||||
101047 null
|
||||
101048 null
|
||||
101049 null
|
||||
101050 null
|
||||
101051 null
|
||||
101052 null
|
||||
101053 null
|
||||
101054 null
|
||||
101055 null
|
||||
101031 101036
|
||||
101032 101037#101038
|
||||
101033 101039#101040
|
||||
101034 101041#101042
|
||||
101035 101043#101044
|
||||
101036 101045#101046
|
||||
101037 101047
|
||||
101038 101048
|
||||
101039 101049#101050
|
||||
101040 101051
|
||||
101041 101052
|
||||
101042 101053
|
||||
101043 101054
|
||||
101044 101055
|
||||
101045 101056
|
||||
101046 101057
|
||||
101047 101058
|
||||
101048 101059
|
||||
101049 101060
|
||||
101050 101061
|
||||
101051 101062
|
||||
101052 101063
|
||||
101053 101064
|
||||
101054 101065
|
||||
101055 101066
|
||||
101056 101067
|
||||
101057 101068
|
||||
101058 101069
|
||||
101059 101070
|
||||
101060 101071
|
||||
101061 101072
|
||||
101062 101073
|
||||
101063 101074
|
||||
101064 101075
|
||||
101065 101076
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula
|
||||
int mut,int#int,2 mut,int#int,1 int int mut,int#int,1
|
||||
1 4#100|14#100|10001#1 0#0#10#1 100 2 0#0#10#1
|
||||
int mut,int#int,2 mut,float#float,1 int int mut,int#int,1
|
||||
1 4#100|14#100|10001#1 0#0#0.3164#0 100 2 0#0#10#1
|
||||
|
|
|
@ -1,54 +1,54 @@
|
|||
Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed ActionPower RankupConsumeMaterial OpenSkillRules
|
||||
int int int int int int int float float float float float int mut,int#int,2 mut,int#int,2
|
||||
10001 11001 50 5 1 1 10 2390 167 275 96 176 10 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10002 11002 50 5 5 2 10 2278 165 265 93 158 10 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10003 11003 50 5 2 3 10 2277 155 259 91 172 10 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10004 11004 50 5 3 4 10 2263 183 97 278 132 10 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10005 11005 50 5 4 5 10 2163 170 92 263 176 10 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10006 11006 50 5 3 6 10 2159 174 93 265 176 10 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10007 11007 50 5 1 2 10 2161 168 91 261 176 10 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10008 11008 50 5 5 2 10 2016 208 77 220 132 10 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10009 11009 50 5 2 2 10 1922 196 74 212 163 10 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10010 11010 50 5 3 2 10 1919 202 71 203 132 10 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10011 11011 50 5 4 2 10 1921 198 71 203 150 10 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10012 11012 50 5 3 2 10 1768 253 201 70 150 10 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10013 11013 50 5 1 3 10 1682 244 199 70 163 10 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10014 11014 50 5 5 3 10 1676 245 200 70 185 10 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10015 11015 50 5 2 3 10 1680 245 198 69 176 10 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10016 11016 50 5 3 3 10 1507 293 160 56 154 10 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10017 11017 50 5 4 3 10 1437 278 157 55 154 10 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10018 11018 50 5 3 3 10 1440 285 154 54 154 10 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10019 11019 50 5 1 4 10 1440 284 159 56 154 10 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10020 11020 50 5 5 4 10 2280 164 256 90 154 10 6#1#3#1|6#2#41#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10021 11021 40 5 2 4 10 1941 133 218 76 176 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10022 11022 40 5 3 4 10 1630 175 62 178 163 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#23#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10023 11023 40 5 4 4 10 1428 208 161 56 194 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10024 11024 40 4 3 4 10 1225 237 135 47 154 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10025 11025 40 4 1 4 10 1831 148 78 223 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10026 11026 40 4 5 4 10 1943 132 223 78 176 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10027 11027 40 4 2 4 10 1629 169 61 173 163 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10028 11028 40 4 3 4 10 1431 203 166 58 194 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10029 11029 40 4 4 4 10 1223 241 136 48 154 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10030 11030 40 4 3 4 10 1835 140 76 218 176 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#31#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10031 11031 40 4 1 4 10 1940 133 221 77 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10032 11032 40 4 5 4 10 1636 172 61 175 163 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10033 11033 40 4 2 4 10 1433 209 169 59 194 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10034 11034 40 4 3 4 10 1222 237 137 48 154 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10035 11035 40 4 4 4 10 1832 147 76 217 176 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10036 11036 40 4 3 4 10 1933 137 217 76 176 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10037 11037 40 4 1 4 10 1630 170 63 180 163 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10038 11038 40 4 5 4 10 1428 204 169 59 194 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#39#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10039 11039 40 4 2 4 10 1292 235 136 48 154 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10040 11040 40 4 3 4 10 1945 142 78 224 176 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#41#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10041 11041 40 4 4 4 10 1935 134 225 79 176 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#42#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10042 11042 40 4 3 4 10 1634 172 63 179 163 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#43#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10043 11043 40 4 1 4 10 1943 134 220 77 176 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#44#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10044 11044 40 4 5 4 10 1629 169 61 173 163 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10045 11045 40 4 2 4 10 1423 200 167 58 194 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10046 11046 30 4 3 4 10 1222 240 135 47 154 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10047 11047 30 3 4 4 10 1838 140 79 225 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10048 11048 30 3 3 4 10 1940 138 220 77 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10049 11049 30 3 1 4 10 1627 165 62 176 163 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10050 11050 30 3 5 4 10 1433 204 169 59 194 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10051 11051 30 3 2 4 10 1222 233 131 46 154 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10052 11052 30 3 3 4 10 1834 142 79 225 176 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10001 11001 50 5 1 1 10 2397 172 273 96 179 10 6#1#3#1|6#2#22#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10002 11002 50 5 5 2 10 2284 156 260 91 159 10 6#1#3#1|6#2#23#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10003 11003 50 5 2 3 10 2285 155 256 90 181 10 6#1#3#1|6#2#24#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10004 11004 50 5 3 4 10 2272 182 96 275 135 10 6#1#3#1|6#2#25#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10005 11005 50 5 4 5 10 2160 167 91 259 172 10 6#1#3#1|6#2#26#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10006 11006 50 5 3 6 10 2155 174 90 256 184 10 6#1#3#1|6#2#27#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10007 11007 50 5 1 2 10 2162 174 259 91 174 10 6#1#3#1|6#2#28#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10008 11008 50 5 5 2 10 2108 210 76 216 135 10 6#1#3#1|6#2#29#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10009 11009 50 5 2 2 10 1915 201 208 73 170 10 6#1#3#1|6#2#30#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10010 11010 50 5 3 2 10 1924 202 72 206 132 10 6#1#3#1|6#2#31#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10011 11011 50 5 4 2 10 1922 202 72 206 157 10 6#1#3#1|6#2#32#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10012 11012 50 5 3 2 10 1769 248 208 73 146 10 6#1#3#1|6#2#33#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10013 11013 50 5 1 3 10 1685 240 194 68 168 10 6#1#3#1|6#2#34#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10014 11014 50 5 5 3 10 1681 238 197 69 181 10 6#1#3#1|6#2#35#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10015 11015 50 5 2 3 10 1685 235 69 197 175 10 6#1#3#1|6#2#36#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10016 11016 50 5 3 3 10 1513 293 56 160 151 10 6#1#3#1|6#2#37#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10017 11017 50 5 4 3 10 1440 275 56 161 159 10 6#1#3#1|6#2#38#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10018 11018 50 5 3 3 10 1442 278 53 151 153 10 6#1#3#1|6#2#39#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10019 11019 50 5 1 4 10 1442 280 158 55 154 10 6#1#3#1|6#2#40#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10020 11020 50 5 5 4 10 2275 156 255 89 160 10 6#1#3#1|6#2#41#1|6#3#17#3|7#1#17#4|8#1#17#3|9#1#3#1|9#2#18#1|9#3#17#2|10#1#3#2|10#2#18#1|10#3#21#2 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10021 11021 40 5 2 4 10 1921 200 71 204 165 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#22#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10022 11022 40 5 3 4 10 1683 235 67 192 167 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#23#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10023 11023 40 5 4 4 10 1445 284 54 154 179 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#24#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10024 11024 40 4 3 4 10 1939 138 218 76 185 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#25#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10025 11025 40 4 1 4 10 1635 170 61 174 172 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#26#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10026 11026 40 4 5 4 10 2049 133 224 78 181 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#27#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10027 11027 40 4 2 4 10 1943 146 221 77 183 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#28#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10028 11028 40 4 3 4 10 1298 233 47 134 153 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10029 11029 40 4 4 4 10 1221 234 47 135 157 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10030 11030 40 4 3 4 10 1839 147 79 226 172 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#31#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10031 11031 40 4 1 4 10 1935 135 216 76 181 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#32#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10032 11032 40 4 5 4 10 1428 208 168 59 194 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#33#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10033 11033 40 4 2 4 10 1228 242 132 46 161 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#34#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10034 11034 40 4 3 4 10 1293 237 45 128 158 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#35#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10035 11035 40 4 4 4 10 1724 174 174 61 173 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#36#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10036 11036 40 4 3 4 10 1732 171 61 173 171 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#37#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10037 11037 40 4 1 4 10 1428 202 169 59 192 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#38#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10038 11038 40 4 5 4 10 1228 239 46 132 156 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#39#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10039 11039 40 4 2 4 10 1429 202 170 60 190 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#40#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10040 11040 40 4 3 4 10 1936 131 221 77 176 10 5#1#2#3|5#2#69#4|5#3#16#4|6#1#3#1|6#2#41#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10041 11041 40 4 4 4 10 1938 136 221 77 183 10 5#1#2#3|5#2#70#4|5#3#16#4|6#1#3#1|6#2#42#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10042 11042 40 4 3 4 10 1939 136 218 76 181 10 5#1#2#3|5#2#71#4|5#3#16#4|6#1#3#1|6#2#43#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10043 11043 40 4 1 4 10 1223 233 130 46 149 10 5#1#2#3|5#2#72#4|5#3#16#4|6#1#3#1|6#2#44#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10044 11044 40 4 5 4 10 1424 203 58 167 196 10 5#1#2#3|5#2#73#4|5#3#16#4|6#1#3#1|6#2#29#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10045 11045 40 4 2 4 10 1839 142 77 220 184 10 5#1#2#3|5#2#68#4|5#3#16#4|6#1#3#1|6#2#30#1|6#3#17#3 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10046 11046 30 4 3 4 10 1513 206 58 167 182 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10047 11047 30 3 4 4 10 1935 138 217 76 174 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10048 11048 30 3 3 4 10 1630 175 180 63 171 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10049 11049 30 3 1 4 10 1429 209 167 58 190 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10050 11050 30 3 5 4 10 1228 233 46 130 159 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10051 11051 30 3 2 4 10 1946 145 79 225 186 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
10052 11052 30 3 3 4 10 2056 140 77 219 183 10 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial Star
|
||||
int int float int int int int mut,int#int,2 int
|
||||
1 1 2000 30 40 5 5 14#10000|4#20 5
|
||||
2 1 5000 40 50 5 5 14#20000|4#40 5
|
||||
3 1 9000 50 60 5 5 14#30000|4#100 5
|
||||
4 1 14000 60 80 5 5 14#30000|4#300 5
|
||||
5 1 20000 80 100 5 5 14#70000|4#1000 5
|
||||
6 1 60000 100 140 5 6 14#120000|4#0 5
|
||||
7 2 2000 140 160 6 7 14#0|4#2000 5
|
||||
8 2 4000 160 180 7 8 14#0|4#3000 5
|
||||
9 2 7000 180 200 8 9 14#0|4#4000 5
|
||||
10 2 10000 200 250 9 10 14#0|4#10000 5
|
||||
51 1 2000 30 40 4 4 14#10000|4#20 4
|
||||
52 1 5000 40 50 4 4 14#20000|4#40 4
|
||||
53 1 9000 50 60 4 4 14#30000|4#100 4
|
||||
54 1 14000 60 80 4 4 14#30000|4#300 4
|
||||
55 1 20000 80 100 4 5 14#70000|4#1000 4
|
||||
56 1 60000 100 140 5 6 14#120000|4#0 4
|
||||
57 2 2000 140 160 6 7 14#0|4#2000 4
|
||||
58 2 4000 160 180 7 8 14#0|4#3000 4
|
||||
59 2 7000 180 200 8 9 14#0|4#4000 4
|
||||
101 1 2000 30 40 3 3 14#10000|4#20 3
|
||||
102 1 5000 40 50 3 3 14#20000|4#40 3
|
||||
103 1 9000 50 60 3 3 14#30000|4#100 3
|
||||
Id Type RankupPara LimitLevel OpenLevel LimitStar OpenStar ConsumeMaterial Star Show
|
||||
int int float int int int int mut,int#int,2 int int
|
||||
101 1 2000 30 40 5 5 14#10000|4#20 5 1
|
||||
102 1 5000 40 50 5 5 14#20000|4#40 5 1
|
||||
103 1 9000 50 60 5 5 14#30000|4#100 5 1
|
||||
104 1 14000 60 80 5 5 14#30000|4#300 5 1
|
||||
105 1 20000 80 100 5 5 14#70000|4#1000 5 1
|
||||
106 1 60000 100 140 5 6 14#120000|4#0 5 2
|
||||
107 2 2000 140 160 6 7 14#0|4#2000 5 2
|
||||
108 2 4000 160 180 7 8 14#0|4#3000 5 2
|
||||
109 2 7000 180 200 8 9 14#0|4#4000 5 2
|
||||
110 2 10000 200 250 9 10 14#0|4#10000 5 2
|
||||
201 1 2000 30 40 4 4 14#10000|4#20 4 1
|
||||
202 1 5000 40 50 4 4 14#20000|4#40 4 1
|
||||
203 1 9000 50 60 4 4 14#30000|4#100 4 1
|
||||
204 1 14000 60 80 4 4 14#30000|4#300 4 1
|
||||
205 1 20000 80 100 4 5 14#70000|4#1000 4 2
|
||||
206 1 60000 100 140 5 6 14#120000|4#0 4 2
|
||||
207 2 2000 140 160 6 7 14#0|4#2000 4 2
|
||||
208 2 4000 160 180 7 8 14#0|4#3000 4 2
|
||||
209 2 7000 180 200 8 9 14#0|4#4000 4 2
|
||||
301 1 2000 30 40 3 3 14#10000|4#20 3 1
|
||||
302 1 5000 40 50 3 3 14#20000|4#40 3 1
|
||||
303 1 9000 50 60 3 3 14#30000|4#100 3 1
|
||||
|
|
|
@ -7,11 +7,11 @@ int int int int int int
|
|||
101005 3 2 1 0 101005
|
||||
101006 4 2 1 0 101006
|
||||
101007 5 3 1 0 101007
|
||||
101008 5 4 1 0 101029
|
||||
101009 5 3 1 0 101030
|
||||
101010 5 3 1 0 101031
|
||||
101011 5 3 1 0 101032
|
||||
101012 5 3 1 0 101033
|
||||
101008 5 4 1 0 101032
|
||||
101009 5 3 1 0 101007
|
||||
101010 5 3 1 0 101007
|
||||
101011 5 3 1 0 101065
|
||||
101012 5 3 1 0 101065
|
||||
101013 8 2 1 0 0
|
||||
102001 1 2 1 0 0
|
||||
102002 1 2 1 0 0
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Id Type Values
|
||||
int int mut,int#int,2
|
||||
1 2 1503#1
|
||||
2 1 101008
|
||||
2 1 101008#101061
|
||||
0 0 null
|
||||
0 0 null
|
||||
0 0 null
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
Id AddConditionID BehaviorType BehaviorTypeValues Reward JumpType JumpTypeValues
|
||||
int int int mut,int#int,2 mut,int#int,2 int mut,int#int,2
|
||||
101001 1 2 1503#1 null 4 null
|
||||
101001 1 2 1503#1 null 5 null
|
||||
101002 0 0 null null 4 null
|
||||
101003 0 0 null null 5 null
|
||||
101003 0 5 0 null 4 null
|
||||
101004 0 0 null null 4 null
|
||||
101005 0 0 null null 6 102
|
||||
101005 0 5 102 null 4 null
|
||||
101006 0 0 null null 4 null
|
||||
101007 0 0 null null 1 101008
|
||||
101008 0 0 null null 4 null
|
||||
|
@ -17,23 +17,62 @@ int int int mut,int#int,2 mut,int#int,2 int mut,int#int,2
|
|||
101015 0 0 null null 1 101013
|
||||
101016 0 0 null null 4 null
|
||||
101017 0 0 null null 1 101014
|
||||
101018 0 0 null null 3 101015#101028|2
|
||||
101018 0 0 null null 3 101015#101031|1#2
|
||||
101019 0 0 null null 4 null
|
||||
101020 0 0 null null 3 101016
|
||||
101021 0 0 null null 3 101017
|
||||
101022 0 0 null null 3 101018
|
||||
101023 0 0 null null 3 101019
|
||||
101024 0 0 null null 3 101020
|
||||
101025 0 0 null null 3 101021
|
||||
101026 0 0 null null 3 101022
|
||||
101027 0 0 null null 3 101023
|
||||
101028 0 0 null null 1 101024
|
||||
101029 0 0 null null 3 101025
|
||||
101030 0 0 null null 3 101026
|
||||
101031 0 0 null null 3 101027
|
||||
101032 0 0 null null 3 101028
|
||||
101033 0 0 null null 3 101029
|
||||
101034 0 0 null null 3 101030
|
||||
101035 0 0 null null 5 null
|
||||
101036 1 2 1503#1 null 4 null
|
||||
101037 0 0 null null 4 null
|
||||
101020 0 0 null null 1 101016
|
||||
101021 0 0 null null 1 101017
|
||||
101022 0 0 null null 1 101018
|
||||
101023 0 0 null null 1 101019
|
||||
101024 0 0 null null 1 101020
|
||||
101025 0 0 null null 1 101021
|
||||
101026 0 0 null null 1 101022
|
||||
101027 0 0 null null 6 101023
|
||||
101028 0 0 null null 6 101024
|
||||
101029 0 0 null null 1 101025
|
||||
101030 0 0 null null 6 101026
|
||||
101031 0 0 null null 6 101027
|
||||
101032 0 0 null null 1 101028
|
||||
101033 0 0 null null 6 101029
|
||||
101034 0 0 null null 1 101030
|
||||
101035 0 5 0 null 5 null
|
||||
101036 0 0 null null 6 101014
|
||||
101037 0 0 null null 1 101033
|
||||
101038 0 0 null null 4 null
|
||||
101039 0 0 null null 1 101034
|
||||
101040 0 0 null null 4 null
|
||||
101041 0 0 null null 1 101035
|
||||
101042 0 0 null null 4 null
|
||||
101043 0 0 null null 1 101036
|
||||
101044 0 0 null null 4 null
|
||||
101045 0 0 null null 1 101037
|
||||
101046 0 0 null null 4 null
|
||||
101047 0 0 null null 1 101038
|
||||
101048 0 0 null null 1 101039
|
||||
101049 0 0 null null 1 101040
|
||||
101050 0 0 null null 4 null
|
||||
101051 0 0 null null 1 101041
|
||||
101052 0 0 null null 1 101042
|
||||
101053 0 0 null null 1 101043
|
||||
101054 0 0 null null 1 101044
|
||||
101055 0 0 null null 1 101045
|
||||
101056 0 0 null null 1 101046
|
||||
101057 0 0 null null 1 101047
|
||||
101058 0 0 null null 1 101048
|
||||
101059 0 0 null null 1 101049
|
||||
101060 0 0 null null 1 101050
|
||||
101061 0 0 null null 1 101051
|
||||
101062 0 0 null null 1 101052
|
||||
101063 0 0 null null 1 101053
|
||||
101064 0 0 null null 1 101054
|
||||
101065 0 0 null null 1 101055
|
||||
101066 0 0 null null 1 101056
|
||||
101067 0 0 null null 1 101057
|
||||
101068 0 0 null null 1 101058
|
||||
101069 0 0 null null 1 101059
|
||||
101070 0 0 null null 1 101060
|
||||
101071 0 0 null null 6 101061
|
||||
101072 0 0 null null 1 101062
|
||||
101073 0 0 null null 1 101063
|
||||
101074 0 0 null null 1 101064
|
||||
101075 0 0 null null 6 101061
|
||||
101076 0 0 null null 4 null
|
||||
|
|
Binary file not shown.
|
@ -1,6 +0,0 @@
|
|||
Manifest-Version: 1.0
|
||||
Premain-Class: com.ljsd.jieling.hotfix.JavaAgent
|
||||
Agent-Class: com.ljsd.jieling.hotfix.JavaAgent
|
||||
Can-Redefine-Classes: true
|
||||
Can-Retransform-Classes: true
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -17,7 +17,7 @@ dependencies {
|
|||
|
||||
compile("org.javassist:javassist:3.18.2-GA")
|
||||
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
|
||||
compile("io.netty:netty-all:4.0.21.Final")
|
||||
compile("io.netty:netty-all:4.1.6.Final")
|
||||
compile("com.google.protobuf:protobuf-java:2.5.0")
|
||||
compile 'com.google.guava:guava:23.5-android'
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,3 +0,0 @@
|
|||
Manifest-Version: 1.0
|
||||
Main-Class: com.ljsd.jieling.NettyApplication
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,6 +1,7 @@
|
|||
package com.ljsd.jieling.netty.cocdex;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufUtil;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.codec.ByteToMessageDecoder;
|
||||
import org.slf4j.Logger;
|
||||
|
@ -41,7 +42,8 @@ public class TeaDecoder extends ByteToMessageDecoder {
|
|||
ByteBuf message = in.readBytes(encodeLen);
|
||||
// int[] secretKey = SessionManager.getSecretKey(ctx);
|
||||
int[] secretKey = Tea.KEY;
|
||||
byte[] packetNetData = Tea.decrypt2( message.array(), length,0, secretKey);
|
||||
|
||||
byte[] packetNetData = Tea.decrypt2( ByteBufUtil.getBytes(message), length,0, secretKey);
|
||||
out.add(packetNetData);
|
||||
}
|
||||
}catch (Exception e){
|
||||
|
|
|
@ -22,7 +22,7 @@ dependencies {
|
|||
compile("org.springframework.boot:spring-boot:1.5.9.RELEASE")
|
||||
compile("org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE")
|
||||
compile("org.springframework.boot:spring-boot-starter-data-redis:1.5.9.RELEASE")
|
||||
compile("io.netty:netty-all:4.0.21.Final")
|
||||
compile("io.netty:netty-all:4.1.6.Final")
|
||||
compile("com.google.protobuf:protobuf-java:2.5.0")
|
||||
compile("com.fasterxml.jackson.core:jackson-core:2.3.1")
|
||||
compile("com.fasterxml.jackson.core:jackson-databind:2.3.3")
|
||||
|
|
|
@ -30,22 +30,24 @@ public class SCHeroRankUpConfig implements BaseConfig{
|
|||
|
||||
private int star;
|
||||
|
||||
private int show;
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
Map<Integer,Map<Integer,Map<Integer,SCHeroRankUpConfig>>> result = new HashMap<>();
|
||||
Map<Integer,Map<Integer,Map<Integer,SCHeroRankUpConfig>>> result = new TreeMap<>();
|
||||
Map<Integer, SCHeroRankUpConfig> config = STableManager.getConfig(SCHeroRankUpConfig.class);
|
||||
for(SCHeroRankUpConfig scHeroRankUpConfig: config.values()){
|
||||
int type = scHeroRankUpConfig.getType();
|
||||
if(!result.containsKey(type)){
|
||||
result.put(type,new TreeMap<>());
|
||||
int show = scHeroRankUpConfig.getShow();
|
||||
if(!result.containsKey(show)){
|
||||
result.put(show,new TreeMap<>());
|
||||
}
|
||||
if(!result.get(type).containsKey(scHeroRankUpConfig.getStar())){
|
||||
result.get(type).put(scHeroRankUpConfig.getStar(),new HashMap<>());
|
||||
if(!result.get(show).containsKey(scHeroRankUpConfig.getStar())){
|
||||
result.get(show).put(scHeroRankUpConfig.getStar(),new TreeMap<>());
|
||||
}
|
||||
if(type == GlobalsDef.UP_STAR_TYPE){
|
||||
result.get(type).get(scHeroRankUpConfig.getStar()).put(scHeroRankUpConfig.getLimitStar(),scHeroRankUpConfig);
|
||||
if(show == GlobalsDef.UP_STAR_TYPE){
|
||||
result.get(show).get(scHeroRankUpConfig.getStar()).put(scHeroRankUpConfig.getLimitStar(),scHeroRankUpConfig);
|
||||
}
|
||||
result.get(type).get(scHeroRankUpConfig.getStar()).put(scHeroRankUpConfig.getLimitLevel(),scHeroRankUpConfig);
|
||||
result.get(show).get(scHeroRankUpConfig.getStar()).put(scHeroRankUpConfig.getLimitLevel(),scHeroRankUpConfig);
|
||||
}
|
||||
scHeroRankUpConfigByStar = result;
|
||||
}
|
||||
|
@ -89,4 +91,8 @@ public class SCHeroRankUpConfig implements BaseConfig{
|
|||
public int getStar() {
|
||||
return star;
|
||||
}
|
||||
|
||||
public int getShow() {
|
||||
return show;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ public class SGameSetting implements BaseConfig {
|
|||
|
||||
private int[][] bornItem;
|
||||
|
||||
private int[] speedFormula;
|
||||
private float[] speedFormula;
|
||||
|
||||
private int initialEnergy;
|
||||
|
||||
|
@ -44,7 +44,7 @@ public class SGameSetting implements BaseConfig {
|
|||
return bornItem;
|
||||
}
|
||||
|
||||
public int[] getSpeedFormula() {
|
||||
public float[] getSpeedFormula() {
|
||||
return speedFormula;
|
||||
}
|
||||
|
||||
|
@ -60,14 +60,15 @@ public class SGameSetting implements BaseConfig {
|
|||
return actionPowerRormula;
|
||||
}
|
||||
|
||||
public float calSpeed(float speed, int breakTimes){
|
||||
if(breakTimes == 0){
|
||||
public float calSpeed(float speed, int breakId){
|
||||
if(breakId == 0){
|
||||
return 0;
|
||||
}
|
||||
float result = speed;
|
||||
breakId = breakId%100;
|
||||
float result = 0;
|
||||
int length = speedFormula.length;
|
||||
for(int i=0;i< speedFormula.length;i++){
|
||||
double pow = Math.pow(breakTimes, --length);
|
||||
double pow = Math.pow(breakId, --length);
|
||||
result += speedFormula[i]*pow;
|
||||
}
|
||||
return result;
|
||||
|
|
|
@ -17,4 +17,8 @@ public interface GlobalsDef {
|
|||
int RANKUP_PARA_TYPE =1;
|
||||
int BREAK_PARA_TYPE =2;
|
||||
|
||||
// 属性加成类型
|
||||
int ABSOLUTE_TYPE =1; // 绝对值
|
||||
int PERCENT_TYPE =2; // 百分比
|
||||
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ public class Cell extends MongoBase {
|
|||
|
||||
private int cellId;
|
||||
|
||||
// 这个一般不变
|
||||
private int pointId;
|
||||
|
||||
private int eventId;
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
package com.ljsd.jieling.handler.map;
|
||||
|
||||
import com.ljsd.jieling.config.SCMap;
|
||||
import com.ljsd.jieling.config.MapPointConfig;
|
||||
import com.ljsd.jieling.config.SEventPointConfig;
|
||||
import com.ljsd.jieling.config.SOptionConfig;
|
||||
import com.ljsd.jieling.config.*;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
|
@ -88,6 +85,9 @@ public class MapLogic {
|
|||
List<CommonProto.Cell> cells = new ArrayList<>(mapManager.getMapInfo().size());
|
||||
for (Map.Entry<Integer, Cell> entry : mapManager.getMapInfo().entrySet()) {
|
||||
Cell cell = entry.getValue();
|
||||
if (cell.getEventId() == -1) {
|
||||
continue;
|
||||
}
|
||||
CommonProto.Cell cellProto = CommonProto.Cell
|
||||
.newBuilder()
|
||||
.setCellId(entry.getKey())
|
||||
|
@ -240,7 +240,7 @@ public class MapLogic {
|
|||
}
|
||||
int bigEventId = cell.getEventId();
|
||||
if (eventId != bigEventId) {
|
||||
LOGGER.info("eventId != bigEventId =>{} {}", eventId, bigEventId);
|
||||
LOGGER.info("eventId != bigEventId =>{} {}, xy=>{}", eventId, bigEventId, mapManager.getCurXY());
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
|
@ -251,6 +251,11 @@ public class MapLogic {
|
|||
return;
|
||||
}
|
||||
int[] option = sEventPointConfig.getOption();
|
||||
if (option == null) {
|
||||
LOGGER.info("option == null sEventPointConfig.getId()=>{}", sEventPointConfig.getId());
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
boolean can = false;
|
||||
for (int i = 0; i < option.length; i++) {
|
||||
if (option[i] == optionId) {
|
||||
|
@ -293,20 +298,6 @@ public class MapLogic {
|
|||
isSuccess = true;
|
||||
break;
|
||||
}
|
||||
// case EventType.attribute: {
|
||||
// Set<String> heroes = mapManager.getHeroes();
|
||||
// for (String heroId : heroes) {
|
||||
// Hero hero = user.getHeroManager().getHero(heroId);
|
||||
// if (hero == null || hero.getCurHp() == 0) {
|
||||
// continue;
|
||||
// }
|
||||
// float hp = HeroLogic.getInstance().calHeroAttribute(hero, GlobalsDef.HP_TYPE);
|
||||
//
|
||||
//// eventArr[1]
|
||||
// }
|
||||
// isSuccess = true;
|
||||
// break;
|
||||
// }
|
||||
case EventType.leave: {
|
||||
int randomInt = MathUtils.randomInt(100) + 1;
|
||||
if (randomInt <= behaviorTypeValues[0][0]) {
|
||||
|
@ -319,7 +310,11 @@ public class MapLogic {
|
|||
break;
|
||||
}
|
||||
case EventType.jump: {
|
||||
|
||||
isSuccess = true;
|
||||
if (behaviorTypeValues[0][0] != 0) {
|
||||
mapManager.setCurMapId(behaviorTypeValues[0][0]);
|
||||
initMap(mapManager);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
|
@ -332,7 +327,9 @@ public class MapLogic {
|
|||
int[][] jumpTypeValues = sOptionConfig.getJumpTypeValues();
|
||||
switch (jumpType) {
|
||||
// 1 无条件跳转,对应事件点
|
||||
case 1:{
|
||||
// 6 无条件跳转地图id
|
||||
case 1:
|
||||
case 6:{
|
||||
nextPoint = jumpTypeValues[0][0];
|
||||
break;
|
||||
}
|
||||
|
@ -348,19 +345,43 @@ public class MapLogic {
|
|||
}
|
||||
// 3 条件跳转 1001#1002|0(0或1为和)#条件id#条件id
|
||||
case 3:{
|
||||
SOptionAddCondition sOptionAddConditions = SOptionAddCondition.sOptionAddConditionMap.get(jumpTypeValues[1][1]);
|
||||
if (sOptionAddConditions == null) {
|
||||
LOGGER.info("sOptionAddConditions == null jumpTypeValues[1][1]=>{}", jumpTypeValues[1][1]);
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
// 1 完成事件点,即进度100%
|
||||
if (sOptionAddConditions.getType() == 1) {
|
||||
int doneEvent = sOptionAddConditions.getValues()[0][0];
|
||||
for (Cell cell1 : mapManager.getMapInfo().values()) {
|
||||
if (cell1.getPointId() == doneEvent) {
|
||||
if (cell1.getEventId() >= sOptionAddConditions.getValues()[0][1]) {
|
||||
nextPoint = jumpTypeValues[0][0];
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 2 物品数量
|
||||
} else if (sOptionAddConditions.getType() == 2) {
|
||||
|
||||
} else {
|
||||
// 3 角色属性
|
||||
|
||||
}
|
||||
if (nextPoint == 0) {
|
||||
nextPoint = jumpTypeValues[0][1];
|
||||
}
|
||||
break;
|
||||
}
|
||||
// 4 不跳转,关闭界面
|
||||
case 4:{
|
||||
nextPoint = -1;
|
||||
nextPoint = cell.getEventId();
|
||||
break;
|
||||
}
|
||||
// 5 返回主城
|
||||
// 5 不跳转,销毁地图点 -1
|
||||
case 5:{
|
||||
break;
|
||||
}
|
||||
// 6 无条件跳转地图id
|
||||
case 6:{
|
||||
nextPoint = -1;
|
||||
break;
|
||||
}
|
||||
default:{
|
||||
|
@ -368,27 +389,20 @@ public class MapLogic {
|
|||
}
|
||||
}
|
||||
MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse = MapInfoProto.EventUpdateResponse.newBuilder();
|
||||
cell.setEventId(nextPoint);
|
||||
mapManager.addOrUpdateCell(mapManager.getCurXY(), cell);
|
||||
int[][] reward = sOptionConfig.getReward();
|
||||
List<CommonProto.Item> rewards = new ArrayList<>();
|
||||
if (reward != null && reward.length > 0) {
|
||||
// ItemUtil.drop()
|
||||
Map<Integer, Integer> itemMap = new HashMap<>();
|
||||
// ItemUtil.addItem(user, itemMap);
|
||||
if (behaviorType != EventType.jump) {
|
||||
cell.setEventId(nextPoint);
|
||||
mapManager.addOrUpdateCell(mapManager.getCurXY(), cell);
|
||||
}
|
||||
int[][] reward = sOptionConfig.getReward();
|
||||
CommonProto.Drop.Builder dropBuilder = null;
|
||||
if (reward != null && reward.length > 0) {
|
||||
Map<Integer, Integer> itemMap = new HashMap<>();
|
||||
dropBuilder = CommonProto.Drop.newBuilder();
|
||||
for (int i = 0; i < reward.length; i++) {
|
||||
itemMap.put(reward[i][0], reward[i][1]);
|
||||
}
|
||||
ItemUtil.addItem(user, itemMap, dropBuilder);
|
||||
}
|
||||
// 如果是传送门开启跳转到下个关卡
|
||||
// if (scMapEvent.getStyle() == EventType.exit) {
|
||||
// Map<Integer, List<Integer>> crossMapInfos = cMap.getCrossMapInfos();
|
||||
// if (!crossMapInfos.containsKey(cMap.getCurMapId())) {
|
||||
// crossMapInfos.put(cMap.getCurMapId(), new ArrayList<>());
|
||||
// }
|
||||
// crossMapInfos.get(cMap.getCurMapId()).addAll(cell.getEventIds());
|
||||
// }
|
||||
// if (scMapEvent.getStyle() == EventType.portal) {
|
||||
// user.getPlayerInfoManager().setMapId(user.getPlayerInfoManager().getMapId() + 1);
|
||||
// return;
|
||||
// }
|
||||
List<CommonProto.EventBehaviorValues> eventBehaviorValuesList = new ArrayList<>();
|
||||
for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) {
|
||||
CommonProto.EventBehaviorValues.Builder eventBehaviorValues = CommonProto.EventBehaviorValues
|
||||
|
@ -404,8 +418,11 @@ public class MapLogic {
|
|||
.addAllEventBehaviorValues(eventBehaviorValuesList)
|
||||
.build();
|
||||
eventUpdateResponse.setEventBehaviorCommon(eventBehaviorCommon);
|
||||
eventUpdateResponse.setEventId(cell.getEventId());
|
||||
LOGGER.info("updateEvent success xy=>{}, getPointId=>{} eventId={}", mapManager.getCurXY(), cell.getPointId(), cell.getEventId());
|
||||
eventUpdateResponse.setEventId(nextPoint);
|
||||
if (dropBuilder != null) {
|
||||
eventUpdateResponse.setDrop(dropBuilder);
|
||||
}
|
||||
LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}", mapManager.getCurXY(), cell.getPointId(), cell.getEventId());
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ public class Equip extends MongoBase {
|
|||
this.secondValueByIdMap = getSecondValue(sEquipConfig.getPool(),secondValue);
|
||||
}
|
||||
|
||||
public Map<Integer,Integer> getSecondValue(int poolId,int nums){
|
||||
private Map<Integer,Integer> getSecondValue(int poolId,int nums){
|
||||
Map<Integer,Integer> result = new HashMap<>();
|
||||
List<SEquipPropertyPool> sEquipPropertyPoolList = SEquipPropertyPool.getSEquipPropertyPool(poolId);
|
||||
int totalWeight = 0;
|
||||
|
@ -114,4 +114,12 @@ public class Equip extends MongoBase {
|
|||
updateString("heroId",heroId);
|
||||
this.heroId = heroId;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPropertyValueByIdMap() {
|
||||
return propertyValueByIdMap;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getSecondValueByIdMap() {
|
||||
return secondValueByIdMap;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.hero;
|
|||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.jieling.config.*;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.item.ItemLogic;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
|
@ -220,16 +221,21 @@ public class HeroLogic {
|
|||
int oldLevel = hero.getLevel();
|
||||
//判断需要进行升级还是进行突破
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByType = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.BREAK_TYPE,scHero.getStar());
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByType.get(oldLevel);
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = null;
|
||||
if(scHeroRankUpConfigByType!=null){
|
||||
scHeroRankUpConfig = scHeroRankUpConfigByType.get(oldLevel);
|
||||
if(scHeroRankUpConfig!=null ){
|
||||
if(hero.getStar() < scHeroRankUpConfig.getLimitStar()){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
boolean isBreak =false;
|
||||
int[][] consume;
|
||||
int breakId = hero.getBreakId();
|
||||
if(scHeroRankUpConfig!=null ){
|
||||
if(hero.getStar() < scHeroRankUpConfig.getLimitStar()){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(scHeroRankUpConfig!=null && breakId!=scHeroRankUpConfig.getId()){
|
||||
isBreak =true;
|
||||
consume = scHeroRankUpConfig.getConsumeMaterial();
|
||||
|
@ -238,6 +244,33 @@ public class HeroLogic {
|
|||
SHeroLevlConfig sHeroLevlConfig = SHeroLevlConfig.getsCHero().get(oldLevel);
|
||||
consume = sHeroLevlConfig.getConsume();
|
||||
}
|
||||
if(!isBreak){
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeStar = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.UP_STAR_TYPE, scHero.getStar());
|
||||
if(scHeroRankUpConfig == null && scHeroRankUpConfigByTypeStar == null && scHeroRankUpConfigByType!=null){
|
||||
boolean isAll = true;
|
||||
for( SCHeroRankUpConfig scHeroRankUpConfigTmp :scHeroRankUpConfigByType.values()){
|
||||
int openLevel = scHeroRankUpConfigTmp.getOpenLevel();
|
||||
if(hero.getLevel()<openLevel){
|
||||
isAll = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(isAll){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(scHeroRankUpConfigByTypeStar!=null){
|
||||
SCHeroRankUpConfig scHeroRankUpConfigStar = scHeroRankUpConfigByTypeStar.get(hero.getStar());
|
||||
if(hero.getLevel()+1 > scHeroRankUpConfigStar.getLimitLevel() && hero.getStar() < scHeroRankUpConfigStar.getOpenStar()){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level");
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//校验消耗
|
||||
boolean result = ItemUtil.itemCost(user, consume);
|
||||
if(!result){
|
||||
|
@ -248,11 +281,10 @@ public class HeroLogic {
|
|||
hero.setLevel( oldLevel + 1);
|
||||
}else{
|
||||
hero.setBreakId(breakId);
|
||||
int upStar = scHeroRankUpConfig.getOpenStar() - hero.getStar();
|
||||
if(upStar>0){
|
||||
hero.upStar(upStar);
|
||||
}
|
||||
|
||||
}
|
||||
Map<Integer, Integer> heroAllAttribute = calHeroAllAttribute(hero);
|
||||
for(Map.Entry<Integer,Integer> item : heroAllAttribute.entrySet() ){
|
||||
LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() );
|
||||
}
|
||||
|
||||
//发送成功消息
|
||||
|
@ -378,12 +410,15 @@ public class HeroLogic {
|
|||
Float heroBaseValue = item.getValue();
|
||||
if(attributeType == GlobalsDef.SPEED_TYPE){
|
||||
result.put (attributeType,(int)(heroBaseValue * sHeroLevlConfig.getSpeedLevelPara() + SGameSetting.getGameSetting().calSpeed(heroBaseValue, hero.getBreakId())));
|
||||
}else{
|
||||
result.put(attributeType,(int)(heroBaseValue * ( 1 + paraForHero.get(GlobalsDef.RANKUP_PARA_TYPE)/10000.f) * characterLevelPara + heroBaseValue * paraForHero.get(GlobalsDef.BREAK_PARA_TYPE)/10000.f));
|
||||
}
|
||||
result.put(attributeType,(int)(heroBaseValue * ( 1 + paraForHero.get(GlobalsDef.RANKUP_PARA_TYPE)/10000.f) * characterLevelPara + heroBaseValue * paraForHero.get(GlobalsDef.BREAK_PARA_TYPE)/10000.f));
|
||||
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
//初始属性*(1+化境增长)*等级系数 + 初始属性*突破系数
|
||||
public int calHeroAttribute(Hero hero,int type){
|
||||
//计算化境增长
|
||||
int templateId = hero.getTemplateId();
|
||||
|
@ -401,21 +436,29 @@ public class HeroLogic {
|
|||
private Map<Integer,Float> getParaForHero(Hero hero){
|
||||
Map<Integer,Float> result = new HashMap<>(2);
|
||||
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeOfStar = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByTypeOfStar.get(hero.getStar());
|
||||
float rankupPara =0.0f;
|
||||
if( scHeroRankUpConfig!=null ){
|
||||
rankupPara = scHeroRankUpConfig.getRankupPara();
|
||||
}
|
||||
//突破系数
|
||||
float breakPara = 0.0f;
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeOfStar = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
||||
if(scHeroRankUpConfigByTypeOfStar!= null){
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByTypeOfStar.get(hero.getStar());
|
||||
if( scHeroRankUpConfig!=null && hero.getLevel() >= scHeroRankUpConfig.getLimitLevel()){
|
||||
if(scHeroRankUpConfig.getType() == GlobalsDef.BREAK_TYPE){
|
||||
breakPara = scHeroRankUpConfig.getRankupPara();
|
||||
}else{
|
||||
rankupPara = scHeroRankUpConfig.getRankupPara();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
int heroLevel = hero.getLevel();
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypOfBreak = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.BREAK_TYPE,scHero.getStar());
|
||||
for( SCHeroRankUpConfig scHeroRankUpConfigTmp :scHeroRankUpConfigByTypOfBreak.values()){
|
||||
if( heroLevel >= scHeroRankUpConfigTmp.getLimitLevel() ){
|
||||
if( heroLevel >= scHeroRankUpConfigTmp.getLimitLevel() && hero.getBreakId()>= scHeroRankUpConfigTmp.getId()){
|
||||
breakPara = scHeroRankUpConfigTmp.getRankupPara();
|
||||
}
|
||||
if(heroLevel <= scHeroRankUpConfigTmp.getOpenLevel()){
|
||||
if(heroLevel < scHeroRankUpConfigTmp.getOpenLevel()){
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -448,20 +491,42 @@ public class HeroLogic {
|
|||
}
|
||||
|
||||
|
||||
//todo 计算英雄战斗力 战斗力 = 生命*0.7 + (护甲 + 魔坑)*5 + 攻击 *10 + (暴击率 + 效果命中率 + 效果抵抗率 )*5 +(属性攻击率 + 属性防御率)*30
|
||||
public int calHeoForce(User user, Hero hero){
|
||||
Map<Integer, Integer> heroAllAttribute = calHeroAllAttribute(hero);
|
||||
double heroBaseForce = heroAllAttribute.get(GlobalsDef.HP_TYPE) * 0.7 + (heroAllAttribute.get(GlobalsDef.PHYSICAL_DEFENCE_TYPE) + heroAllAttribute.get(GlobalsDef.MAGIC_DEFENCE_TYPE)) * 5 + heroAllAttribute.get(GlobalsDef.ATTACK_TYPE) * 10;
|
||||
//todo 计算装备加成
|
||||
Collection<String> values = hero.getEquipByPositionMap().values();
|
||||
EquipManager equipManager = user.getEquipManager();
|
||||
for(String equipId:values){
|
||||
Equip equip = equipManager.getEquipMap().get(equipId);
|
||||
|
||||
Map<Integer, Integer> propertyValueByIdMap = equip.getPropertyValueByIdMap();
|
||||
Map<Integer, Integer> secondValueByIdMap = equip.getSecondValueByIdMap();
|
||||
combinedAttribute(propertyValueByIdMap,heroAllAttribute);
|
||||
combinedAttribute(secondValueByIdMap,heroAllAttribute);
|
||||
}
|
||||
double result = 0;
|
||||
for(Map.Entry<Integer, Integer> item : heroAllAttribute.entrySet()){
|
||||
Integer propertyId = item.getKey();
|
||||
Integer propertyValue = item.getValue();
|
||||
SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId);
|
||||
int style = sPropertyConfig.getStyle();
|
||||
float score = sPropertyConfig.getScore();
|
||||
if(style == GlobalsDef.PERCENT_TYPE){
|
||||
score = score/100;
|
||||
}
|
||||
result += propertyValue*score;
|
||||
}
|
||||
|
||||
return (int)result;
|
||||
}
|
||||
|
||||
private void combinedAttribute(Map<Integer, Integer> otherAttriMaop,Map<Integer,Integer> heroAttributeMap){
|
||||
for(Map.Entry<Integer, Integer> item : otherAttriMaop.entrySet()){
|
||||
Integer propertyId = item.getKey();
|
||||
Integer propertyValue = item.getValue();
|
||||
if(heroAttributeMap.containsKey(propertyId)){
|
||||
propertyValue = heroAttributeMap.get(propertyId);
|
||||
}
|
||||
heroAttributeMap.put(propertyId,propertyValue);
|
||||
}
|
||||
float equipAddForce =0.0f;
|
||||
int result = (int) (heroBaseForce + equipAddForce);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
@ -488,6 +553,8 @@ public class HeroLogic {
|
|||
|
||||
hero.updateEquipPositionMap(position,equipId);
|
||||
|
||||
LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero));
|
||||
|
||||
//发送成功消息
|
||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_REQUEST_VALUE,null,true);
|
||||
|
||||
|
|
|
@ -323,8 +323,9 @@ public class ProtocolsManager implements ProtocolsAbstract {
|
|||
|
||||
@Override
|
||||
public void readIdel(GameSession gameSession) {
|
||||
final ISession session = (ISession) gameSession;
|
||||
readIdea(session);
|
||||
// TODO
|
||||
// final ISession session = (ISession) gameSession;
|
||||
// readIdea(session);
|
||||
}
|
||||
|
||||
public BaseHandler getHandler(MessageTypeProto.MessageType messageType) {
|
||||
|
|
|
@ -40,6 +40,7 @@ public class CBean2Proto {
|
|||
.setHeroId(hero.getTemplateId())
|
||||
.setLevel(hero.getLevel())
|
||||
.setStar(hero.getStar())
|
||||
.setBreakId(hero.getBreakId())
|
||||
.addAllSkillIdList(hero.getSkillList())
|
||||
// .addAllEquipIdList(getHeroEquip(hero.getEquipList()))
|
||||
.build();
|
||||
|
|
Binary file not shown.
|
@ -1,2 +0,0 @@
|
|||
Manifest-Version: 1.0
|
||||
|
Loading…
Reference in New Issue