Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
322c7a3e68
|
@ -662,93 +662,93 @@ int mut,float#float,2 mut,int#int,2 mut,float#float,2 float
|
|||
500108 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500109 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500110 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 1.0
|
||||
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2
|
||||
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3
|
||||
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4
|
||||
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5
|
||||
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6
|
||||
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7
|
||||
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8
|
||||
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9
|
||||
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10
|
||||
500201 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500202 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500203 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500204 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500205 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500206 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500207 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500208 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500209 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500210 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 2.0
|
||||
500301 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500302 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500303 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500304 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500305 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500306 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500307 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500308 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500309 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500310 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 3.0
|
||||
500401 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500402 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500403 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500404 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500405 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500406 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500407 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500408 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500409 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500410 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 4.0
|
||||
500501 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500502 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500503 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500504 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500505 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500506 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500507 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500508 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500509 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500510 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 5.0
|
||||
500601 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500602 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500603 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500604 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500605 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500606 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500607 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500608 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500609 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500610 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 6.0
|
||||
500701 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500702 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500703 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500704 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500705 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500706 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500707 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500708 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500709 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500710 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 7.0
|
||||
500801 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500802 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500803 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500804 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500805 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500806 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500807 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500808 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500809 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500810 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 8.0
|
||||
500901 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500902 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500903 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500904 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500905 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500906 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500907 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500908 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500909 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
500910 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 9.0
|
||||
501001 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501002 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501003 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501004 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501005 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501006 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501007 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501008 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501009 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
501010 20012#0.7|10014#0.7 26#27|25 600|100#4|2#0.1#4 10.0
|
||||
|
|
|
@ -1,36 +1,6 @@
|
|||
RoleData = {}
|
||||
RoleData.__index = RoleData
|
||||
local max = math.max
|
||||
|
||||
local dataOrder = {
|
||||
RoleDataName.Level,
|
||||
RoleDataName.Hp,
|
||||
RoleDataName.MaxHp,
|
||||
RoleDataName.Attack,
|
||||
RoleDataName.PhysicalDefence,
|
||||
RoleDataName.MagicDefence,
|
||||
RoleDataName.Speed,
|
||||
RoleDataName.DamageBocusFactor,
|
||||
RoleDataName.DamageReduceFactor,
|
||||
RoleDataName.Hit,
|
||||
RoleDataName.Dodge,
|
||||
RoleDataName.Crit,
|
||||
RoleDataName.CritDamageFactor,
|
||||
RoleDataName.TreatFacter,
|
||||
RoleDataName.FireDamageBocusFactor,
|
||||
RoleDataName.IceDamageBocusFactor,
|
||||
RoleDataName.LightDamageBocusFactor,
|
||||
RoleDataName.WindDamageBocusFactor,
|
||||
RoleDataName.LandDamageBocusFactor,
|
||||
RoleDataName.DarkDamageBocusFactor,
|
||||
RoleDataName.FireDamageReduceFactor,
|
||||
RoleDataName.IceDamageReduceFactor,
|
||||
RoleDataName.LightDamageReduceFactor,
|
||||
RoleDataName.WindDamageReduceFactor,
|
||||
RoleDataName.LandDamageReduceFactor,
|
||||
RoleDataName.DarkDamageReduceFactor,
|
||||
}
|
||||
|
||||
function RoleData.New()
|
||||
local instance = {role=0, data={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}
|
||||
setmetatable(instance, RoleData)
|
||||
|
@ -40,7 +10,7 @@ end
|
|||
function RoleData:Init(role, data)
|
||||
self.role = role
|
||||
for i=1, #data do
|
||||
self.data[dataOrder[i]] = data[i]
|
||||
self.data[i] = data[i]
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -450,6 +450,11 @@ function BattleLogic.SetRoleDebug(uid, isDebug)
|
|||
end
|
||||
end
|
||||
|
||||
--Record专用
|
||||
function BattleLogic.GetRecord()
|
||||
return record
|
||||
end
|
||||
|
||||
--Record专用
|
||||
function BattleLogic.RecordSeed(seed)
|
||||
table.insert(record, string.format("frame:%d, seed:%d", curFrame, seed))
|
||||
|
|
|
@ -31,31 +31,6 @@ function BattleUtil.CalBaseDamage(atkRole, defRole, baseDamage, baseFactor)
|
|||
local atkData, defData = atkRole.data, defRole.data
|
||||
if not baseFactor then baseFactor = 1 end
|
||||
|
||||
local elementDamage, elementReduce = 0
|
||||
if skillAttribute == 0 then --无属性
|
||||
elementDamage = 0
|
||||
elementReduce = 0
|
||||
elseif skillAttribute == 1 then --火系
|
||||
elementDamage = atkData:GetData(RoleDataName.FireDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.FireDamageReduceFactor)
|
||||
elseif skillAttribute == 2 then --风系
|
||||
elementDamage = atkData:GetData(RoleDataName.WindDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.WindDamageReduceFactor)
|
||||
elseif skillAttribute == 3 then --水系
|
||||
elementDamage = atkData:GetData(RoleDataName.IceDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.IceDamageReduceFactor)
|
||||
elseif skillAttribute == 4 then --地系
|
||||
elementDamage = atkData:GetData(RoleDataName.LandDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.LandDamageReduceFactor)
|
||||
elseif skillAttribute == 5 then --光系
|
||||
elementDamage = atkData:GetData(RoleDataName.LightDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.LightDamageReduceFactor)
|
||||
elseif skillAttribute == 6 then --暗系
|
||||
elementDamage = atkData:GetData(RoleDataName.DarkDamageBocusFactor)
|
||||
elementReduce = defData:GetData(RoleDataName.DarkDamageReduceFactor)
|
||||
end
|
||||
|
||||
|
||||
--伤害 =(基础伤害*(1+己伤害加成-目标伤害减免)*(1+己方属性伤害加成-目标属性伤害减免),10%*己攻)
|
||||
local damage = baseDamage * baseFactor *
|
||||
(1 + atkData:GetData(RoleDataName.DamageBocusFactor)) * (1 - defData:GetData(RoleDataName.DamageReduceFactor)) *
|
||||
|
|
|
@ -708,7 +708,7 @@ public class MapLogic {
|
|||
}
|
||||
|
||||
// frames = "14#1#0|132#2#3|152#2#5|178#3#2|219#2#4|260#3#1|287#2#2|312#3#5|467#1#1";
|
||||
frames ="";
|
||||
// frames ="";
|
||||
LuaValue getFightData = FightDataUtil.getFinalFightData(fightTeamInfo,monsterTeamList);
|
||||
// LuaValue getFightData = FightDataUtil.getTestFightData();
|
||||
LuaValue getOptionData = FightDataUtil.getOptionData(frames);
|
||||
|
@ -716,8 +716,8 @@ public class MapLogic {
|
|||
int[] checkResult = CheckFight.getInstance().checkFight(seed, getFightData, getOptionData);
|
||||
//校验结果码 1:胜利
|
||||
int resultCode = checkResult[0];
|
||||
if (resultCode ==1){
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "特殊处理-->战斗成功");
|
||||
if (resultCode !=1){
|
||||
MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "战斗失败");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -728,9 +728,9 @@ public class MapLogic {
|
|||
hero.setCurHp(checkResult[teamPosHeroInfo.getPosition()]);
|
||||
}
|
||||
|
||||
List<Integer> remainHp = new ArrayList<>();
|
||||
List<Integer> remainHp = new ArrayList<>(5);
|
||||
for (int i = 1; i < checkResult.length; i++) {
|
||||
remainHp.set(i,checkResult[i]);
|
||||
remainHp.add(checkResult[i]);
|
||||
}
|
||||
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1);
|
||||
|
|
|
@ -42,14 +42,14 @@ public class HeroLogic {
|
|||
transTemplate.add(HeroAttributeEnum.TreatFacter.getPropertyId()); // 治疗加成系数
|
||||
transTemplate.add(HeroAttributeEnum.FireDamageBonusFactor.getPropertyId()); // 火系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.FireDamageReduceFactor.getPropertyId()); // 火系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.WaterDamageBonusFactor.getPropertyId()); // 冰系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.WaterDamageReduceFactor.getPropertyId());// 冰系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.LightDamageBonusFactor.getPropertyId()); // 雷系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.LightDamageReduceFactor.getPropertyId());// 雷系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.WindDamageBonusFactor.getPropertyId()); // 风系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.WindDamageReduceFactor.getPropertyId()); // 风系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.WaterDamageBonusFactor.getPropertyId()); // 冰系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.WaterDamageReduceFactor.getPropertyId());// 冰系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.LandDamageBonusFactor.getPropertyId()); // 地系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.LandDamageReduceFactor.getPropertyId()); // 地系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.LightDamageBonusFactor.getPropertyId()); // 雷系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.LightDamageReduceFactor.getPropertyId());// 雷系伤害减免系数
|
||||
transTemplate.add(HeroAttributeEnum.DarkDamageBonusFactor.getPropertyId()); // 暗系伤害加成系数
|
||||
transTemplate.add(HeroAttributeEnum.DarkDamageReduceFactor.getPropertyId()); // 暗系伤害减免系数
|
||||
}
|
||||
|
|
|
@ -156,9 +156,10 @@ public class CBean2Proto {
|
|||
monsterPropertyList.append(sMonsterConfig.getSpeed()).append("#"); //速度
|
||||
monsterPropertyList.append(0).append("#"); //伤害加成系数
|
||||
monsterPropertyList.append(0).append("#"); //伤害减免系数
|
||||
monsterPropertyList.append((int)(sMonsterConfig.getHit() * 10000)).append("#"); //命中率
|
||||
monsterPropertyList.append((int)(sMonsterConfig.getDodge() * 10000)).append("#"); //闪避率
|
||||
monsterPropertyList.append((int)(sMonsterConfig.getCritDamageFactor() * 10000)).append("#"); //暴击伤害系数
|
||||
monsterPropertyList.append(sMonsterConfig.getHit()).append("#"); //命中率
|
||||
monsterPropertyList.append(sMonsterConfig.getDodge()).append("#"); //闪避率
|
||||
monsterPropertyList.append(sMonsterConfig.getCritFactor()).append("#"); //暴击率
|
||||
monsterPropertyList.append(sMonsterConfig.getCritDamageFactor()).append("#"); //暴击伤害系数
|
||||
monsterPropertyList.append(1).append("#"); //治疗加成系数
|
||||
monsterPropertyList.append(damageBonusFactor[0]).append("#"); //火系伤害加成系数
|
||||
monsterPropertyList.append(damageReduceFactor[0]).append("#"); //火系伤害减免系数
|
||||
|
|
Loading…
Reference in New Issue