From b48082bbab9c5fc98141a7db56020cbbdc11efcf Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Sat, 2 Apr 2022 14:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=A5=9E=E9=AD=94=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Battle/Logic/Base/EffectCaster.lua | 44 +-- luafight/Modules/Battle/Readme.txt | 288 +++++++----------- .../SArenaRobotStaticConfig.java | 1 + .../ljsd/jieling/logic/blood/BloodLogic.java | 1 + .../ljsd/jieling/logic/fight/FightUtil.java | 1 + .../jieling/logic/player/PlayerLogic.java | 10 +- 6 files changed, 151 insertions(+), 194 deletions(-) diff --git a/luafight/Modules/Battle/Logic/Base/EffectCaster.lua b/luafight/Modules/Battle/Logic/Base/EffectCaster.lua index e06f815f4..d313ced39 100644 --- a/luafight/Modules/Battle/Logic/Base/EffectCaster.lua +++ b/luafight/Modules/Battle/Logic/Base/EffectCaster.lua @@ -50,7 +50,7 @@ function EffectCaster:DoEffect(caster, target, eff, duration, skill) e.args[i] = eff.args[i] end - -- 检测被动技能对技能参数的影响 + -- 妫娴嬭鍔ㄦ妧鑳藉鎶鑳藉弬鏁扮殑褰卞搷 local function _PassiveCheck(pe) if pe then e = pe @@ -77,7 +77,7 @@ end function EffectCaster:takeEffect(caster, target, effects, effectIndex, duration, skill) for k=1, #effects do - -- 如果不是第一个效果对列的第一个效果则判断是否命中 + -- 濡傛灉涓嶆槸绗竴涓晥鏋滃鍒楃殑绗竴涓晥鏋滃垯鍒ゆ柇鏄惁鍛戒腑 if k ~= 1 and effectIndex == 1 then if self:CheckTargetIsHit(target) then self:DoEffect(caster, target, effects[k], duration, skill) @@ -93,25 +93,25 @@ function EffectCaster:ChooseTarget() -- self.effectTargets = {} self.targetIsHit = {} - -- 先计算出技能的目标 + -- 鍏堣绠楀嚭鎶鑳界殑鐩爣 for i=1, #self.effectList do - -- 是否重新选择目标 + -- 鏄惁閲嶆柊閫夋嫨鐩爣 local isReTarget = true if self.targets and self.targets[i] then self.effectTargets[i] = self.targets[i] - -- 判断是否有有效目标 + -- 鍒ゆ柇鏄惁鏈夋湁鏁堢洰鏍 for _, role in ipairs(self.effectTargets[i]) do if not role:IsRealDead() then isReTarget = false end end end - -- 重新选择目标 + -- 閲嶆柊閫夋嫨鐩爣 if isReTarget then local effectGroup = self.effectList[i] local chooseId = effectGroup.chooseId self.effectTargets[i] = BattleUtil.ChooseTarget(self.skill.owner, chooseId) - -- 检测被动对攻击目标的影响 + -- 妫娴嬭鍔ㄥ鏀诲嚮鐩爣鐨勫奖鍝 if i == 1 then local function _PassiveTarget(targets) self.effectTargets[i] = targets @@ -122,19 +122,19 @@ function EffectCaster:ChooseTarget() end end --- 释放技能 --- func 技能释放完成回调 +-- 閲婃斁鎶鑳 +-- func 鎶鑳介噴鏀惧畬鎴愬洖璋 function EffectCaster:Cast() - -- 选择目标 + -- 閫夋嫨鐩爣 self:ChooseTarget() - -- 对目标造成相应的效果 + -- 瀵圭洰鏍囬犳垚鐩稿簲鐨勬晥鏋 for i=1, #self.effectList do local effectGroup = self.effectList[i] local chooseId = effectGroup.chooseId local arr = self.effectTargets[i] if arr and #arr > 0 then - -- 效果延迟1帧生效 + -- 鏁堟灉寤惰繜1甯х敓鏁 BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function() local effects = effectGroup.effects local weight = math.floor(chooseId % 10000 / 100) @@ -145,10 +145,10 @@ function EffectCaster:Cast() table.sort(arr, function(a, b) return a.position < b.position end) - -- 全部同时生效 + -- 鍏ㄩ儴鍚屾椂鐢熸晥 for j=1, count do if arr[j] and not arr[j]:IsRealDead() then - -- 检测是否命中 + -- 妫娴嬫槸鍚﹀懡涓 if i == 1 then self.targetIsHit[arr[j]] = BattleUtil.CheckIsHit(self.skill.owner, arr[j],self.skill) end @@ -160,7 +160,7 @@ function EffectCaster:Cast() end end --- 遍历技能命中目标 +-- 閬嶅巻鎶鑳藉懡涓洰鏍 function EffectCaster:ForeachTargets(func) local targets = self:GetDirectTargets() for _, role in ipairs(targets) do @@ -170,7 +170,7 @@ function EffectCaster:ForeachTargets(func) end end --- 获取直接选择目标Id +-- 鑾峰彇鐩存帴閫夋嫨鐩爣Id function EffectCaster:GetDirectChooseId() local effectGroup = self.effectList[1] local chooseId = effectGroup.chooseId @@ -178,12 +178,12 @@ function EffectCaster:GetDirectChooseId() end --- 获取技能的直接目标,和策划规定第一个效果的目标为直接效果目标,(包含miss的目标) +-- 鑾峰彇鎶鑳界殑鐩存帴鐩爣锛屽拰绛栧垝瑙勫畾绗竴涓晥鏋滅殑鐩爣涓虹洿鎺ユ晥鏋滅洰鏍,(鍖呭惈miss鐨勭洰鏍) function EffectCaster:GetDirectTargets() return self.effectTargets[1] end --- 获取直接目标,不包含miss的目标,可能为空 +-- 鑾峰彇鐩存帴鐩爣锛屼笉鍖呭惈miss鐨勭洰鏍囷紝鍙兘涓虹┖ function EffectCaster:GetDirectTargetsNoMiss() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -194,7 +194,7 @@ function EffectCaster:GetDirectTargetsNoMiss() return list end --- 获取直接目标和没有被放逐的目标,不包含miss的目标,可能为空 +-- 鑾峰彇鐩存帴鐩爣鍜屾病鏈夎鏀鹃愮殑鐩爣锛屼笉鍖呭惈miss鐨勭洰鏍囷紝鍙兘涓虹┖ function EffectCaster:GetDirectTargetsNoExile() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -205,7 +205,7 @@ function EffectCaster:GetDirectTargetsNoExile() return list end --- 获取直接目标和没有被放逐的目标,不包含不灭可能为空 +-- 鑾峰彇鐩存帴鐩爣鍜屾病鏈夎鏀鹃愮殑鐩爣锛屼笉鍖呭惈涓嶇伃鍙兘涓虹┖ function EffectCaster:GetDirectTargetsNoNODead() local list = {} for _, role in ipairs(self.effectTargets[1]) do @@ -216,7 +216,7 @@ function EffectCaster:GetDirectTargetsNoNODead() return list end --- 获取技能目标最大人数 +-- 鑾峰彇鎶鑳界洰鏍囨渶澶т汉鏁 function EffectCaster:GetMaxTargetNum() local mainEffect = self.effectList[1] if not mainEffect then @@ -225,7 +225,7 @@ function EffectCaster:GetMaxTargetNum() return BattleUtil.GetMaxTargetNum(mainEffect.chooseId) end --- 判断是否命中 +-- 鍒ゆ柇鏄惁鍛戒腑 function EffectCaster:CheckTargetIsHit(role) return self.targetIsHit[role] end diff --git a/luafight/Modules/Battle/Readme.txt b/luafight/Modules/Battle/Readme.txt index b5919bcdb..c847caefe 100644 --- a/luafight/Modules/Battle/Readme.txt +++ b/luafight/Modules/Battle/Readme.txt @@ -1,228 +1,174 @@ -锘縨aster_zh_test鍚屾鏁版嵁琛2022_03_21_16_48_11 -v1.0.109 - 1.鏂板绁炵郴鑻遍泟鎶鑳借鍔 -master_zh_test鍚屾鏁版嵁琛2022_03_14_18_15_06 -master_zh_test鍚屾鏁版嵁琛2022_03_14_17_24_10 -v1.0.108 - 1.鏂板429 430 431琚姩 -master_zh_test鍚屾鏁版嵁琛2022_03_08_16_52_49 -v1.0.107 - 1.鏂板427 428琚姩 -master_zh_test鍚屾鏁版嵁琛2022_03_07_17_48_07 -master_zh_test鍚屾鏁版嵁琛2022_03_02_15_24_08 -v1.0.106 - 1.鏂板425 426琚姩 -master_zh_test鍚屾鏁版嵁琛2022_03_01_15_02_06 -v1.0.105 - 1.鏂板425 426琚姩 -v1.0.104 - 1.琚姩375淇敼 -master_zh_test鍚屾鏁版嵁琛2022_02_22_19_20_35 -master_zh_test鍚屾鏁版嵁琛2022_02_22_18_59_21 -v1.0.103 - 1.琚姩226 423 424淇敼 -master_zh_test鍚屾鏁版嵁琛2022_02_22_10_34_06 -master_zh_test鍚屾鏁版嵁琛2022_02_15_15_03_42 -v1.0.102 - 1.鏁堟灉108淇敼 - 2.琚姩356淇敼 鏂板422 -master_zh_test鍚屾鏁版嵁琛2022_02_08_14_14_42 -v1.0.101 - 1.淇濮戣幏楦熺榄備簲瀵规墍鏈変汉鐢熸晥鐨勯棶棰 -v1.0.100 - 1.寰$敳鍒濆鍖栦慨鏀 -master_zh_test鍚屾鏁版嵁琛2022_01_24_18_51_19 -v1.0.99 - 1.寰$敳鏄剧ず淇敼 -v1.0.98 - 1.琚姩414淇敼 -master_zh_test鍚屾鏁版嵁琛2022_01_24_10_59_41 -master_zh_test鍚屾鏁版嵁琛2022_01_18_15_41_40 -v1.0.97 - 1.鎶ょ浘buff淇敼 -master_zh_test鍚屾鏁版嵁琛2022_01_17_16_56_13 -master_zh_test鍚屾鏁版嵁琛2022_01_17_16_30_59 -master_zh_test鍚屾鏁版嵁琛2022_01_15_19_12_17 -v1.0.96 - 1.琚姩417-421 鐧介噾娉曞疂 -master_zh_test鍚屾鏁版嵁琛2022_01_11_16_23_47 -master_zh_test鍚屾鏁版嵁琛2022_01_10_18_57_57 -v1.0.95 - 1.鏂板琚姩414-417 - 2.娣诲姞寰$敳淇敼 -v1.0.94 - 1.琚姩283淇敼 -v1.0.93 - 1.鎴樻枟缁撴潫鑾峰彇闃熶紞鍓╀綑瑙掕壊淇℃伅鎺ュ彛淇敼 -master_zh_test鍚屾鏁版嵁琛2021_12_28_09_56_49 -master_zh_test鍚屾鏁版嵁琛2021_12_24_18_32_21 -v1.0.92 - 1.鏂板412琚姩 56琚姩淇敼 -master_zh_test鍚屾鏁版嵁琛2021_12_21_18_13_54 +锘縨aster_zh_online_special鍚屾鏁版嵁琛2022_03_29_18_05_16 +master_zh_online_special鍚屾鏁版嵁琛2022_03_29_17_12_38 +master_zh_online_special鍚屾鏁版嵁琛2022_03_22_17_12_19 v1.0.91 - 1.鎶ょ浘buff淇敼 - 2.椴稿悶榄傚嵃淇敼 + 1.鏂板鏂板皢鎶鑳 + 2.涓昏鎶鑳借鍔ㄤ慨鏀 +master_zh_online_special鍚屾鏁版嵁琛2022_03_14_17_38_27 v1.0.90 - 1銆佷慨澶峈oleManager table.removebyvalue鏂规硶绌烘姤閿 -master_zh_test鍚屾鏁版嵁琛2021_12_14_12_03_26 + 1.琚姩429 430 431淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_03_08_14_34_13 v1.0.89 - 1.绗簲鏈熺榄 - 2.绗簩鏈熷彉韬崱 -master_zh_test鍚屾鏁版嵁琛2021_12_13_18_06_46 + 1.琚姩427 428淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_03_07_18_33_58 +master_zh_online_special鍚屾鏁版嵁琛2022_03_02_15_24_02 v1.0.88 - 1.琚姩257淇敼 - 2.涓嶇伃淇敼 + 1.琚姩339淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_03_01_15_11_26 v1.0.87 - 1.琚姩257淇敼 -master_zh_test鍚屾鏁版嵁琛2021_12_07_17_09_58 -master_zh_test鍚屾鏁版嵁琛2021_12_07_16_56_46 + 1.鏂板425 426琚姩 v1.0.86 - 1 鎴樻枟椹卞姩閫昏緫淇敼 鍥炲悎杞崲娣诲姞寤舵椂鍑忓崐 - 2.琚姩257淇敼 + 1.琚姩375淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_02_22_19_07_18 v1.0.85 - 1 鎴樻枟椹卞姩閫昏緫淇敼 鍥炲悎杞崲娣诲姞寤舵椂鍑忓崐 + 1.琚姩226 423 424淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_02_15_15_19_15 v1.0.84 - 1 鎴樻枟椹卞姩閫昏緫淇敼 鍥炲悎杞崲娣诲姞寤舵椂 -master_zh_test鍚屾鏁版嵁琛2021_12_06_19_02_28 + 1.鏁堟灉108淇敼 + 2.琚姩356淇敼 鏂板422 +master_zh_online_special鍚屾鏁版嵁琛2022_02_08_17_17_46 v1.0.83 - 1 绗洓鏈熺榄傛坊鍔 -master_zh_test鍚屾鏁版嵁琛2021_11_30_12_06_26 + 1銆佷慨澶嶅鑾烽笩绁為瓊浜斿鎵鏈変汉鐢熸晥鐨勯棶棰 v1.0.82 - 1 鐩爣閫夋嫨閫昏緫娣诲姞 -master_zh_test鍚屾鏁版嵁琛2021_11_29_19_48_14 + 1.寰$敳鍒濆鍖栨暟鍊间慨鏀 +master_zh_online_special鍚屾鏁版嵁琛2022_01_25_10_12_04 v1.0.81 - 1銆佹晥鏋137淇敼 -master_zh_test鍚屾鏁版嵁琛2021_11_27_22_26_12 + 1.琚姩414淇敼 + 2.寰$敳鏄剧ず淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_01_20_10_06_14 +master_zh_online_special鍚屾鏁版嵁琛2022_01_18_17_33_33 +master_zh_online_special鍚屾鏁版嵁琛2022_01_18_15_44_08 v1.0.80 - 1銆佸悓姝ユ垬鏂楅昏緫 -master_zh_test鍚屾鏁版嵁琛2021_11_23_11_29_17 + 1.琚姩418-421 + 2.鎶ょ浘buff淇敼 +master_zh_online_special鍚屾鏁版嵁琛2022_01_13_17_48_10 +master_zh_online_special鍚屾鏁版嵁琛2022_01_11_16_41_51 v1.0.79 - 1銆佽鍔391淇敼 鎴戞柟娴佽鏄剧ず淇敼 -master_zh_test鍚屾鏁版嵁琛2021_11_22_18_00_26 + 1.琚姩413-418 +master_zh_online_special鍚屾鏁版嵁琛2022_01_11_16_25_15 v1.0.78 - 1銆佽鍔112 258 360淇敼鎻愪氦 - 2. 浼ゅ鍏紡淇敼 - 3.鎴樻枟瓒呮椂 pvp娣诲姞鎴樻枟绫诲瀷 + 1.琚姩283淇敼 v1.0.77 - 1銆佺涓夋壒绁為瓊鎻愪氦 + 1.鎴樻枟缁撴潫杩斿洖鏈嶅姟鍣ㄩ槦浼嶆暟鎹帴鍙d慨鏀 v1.0.76 - 1銆佷慨澶嶅墠鍚庣鎴樻枟鏁版嵁鏍煎紡涓嶄竴鑷村鑷寸殑缁撴灉涓嶄竴鑷 -master_zh_test鍚屾鏁版嵁琛2021_11_16_11_07_25 -锘縱1.0.75 - 1锛屾坊鍔犱笉澶勭悊澧炰激鐨勪激瀹虫帴鍙 -master_zh_test鍚屾鏁版嵁琛2021_11_15_17_10_47 + 1.鏂板412琚姩 56琚姩淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_12_28_09_54_11 +master_zh_online_special鍚屾鏁版嵁琛2021_12_21_18_34_24 +v1.0.75 + 1銆侀哺鍚為瓊鍗颁慨鏀 + 2. 鎶ょ浘鏁堟灉淇敼 v1.0.74 - 1锛岀浜屾湡绁為瓊鎶鑳 -master_zh_test鍚屾鏁版嵁琛2021_11_08_18_01_19 + 1銆佷慨澶峈oleManager table.removebyvalue鏂规硶绌烘姤閿 v1.0.73 - 1锛岃鍔285淇敼 -master_zh_test鍚屾鏁版嵁琛2021_11_08_17_48_59 + 1銆佺浜旀湡绁為瓊鎶鑳 + 2.绗簩鏈熷彉韬崱 +master_zh_online_special鍚屾鏁版嵁琛2021_12_14_14_27_05 +master_zh_online_special鍚屾鏁版嵁琛2021_12_08_13_13_42 v1.0.72 - 1锛岀涓鏈熺榄傛妧鑳 + 1銆佽鍔257淇敼 + 2.涓嶇伃淇敼 v1.0.71 - 1锛岀伒鍏芥妧鑳芥娴嬫坊鍔犲垵濮嬪寲 - 2.杩藉姞鎶鑳界壒鏁堜慨鏀 + 1銆佽鍔257淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_12_07_18_07_35 v1.0.70 - 1銆佹坊鍔犵榄傝鍔ㄦ妧鑳 -master_zh_test鍚屾鏁版嵁琛2021_11_01_14_07_31 -master_zh_test鍚屾鏁版嵁琛2021_10_26_10_10_26 -master_zh_test鍚屾鏁版嵁琛2021_10_25_18_57_36 + 1銆佺鍥涙湡绁為瓊鎶鑳 +master_zh_online_special鍚屾鏁版嵁琛2021_11_30_17_36_04 v1.0.69 - 1銆佹垬鏂楀叕寮忎慨鏀 -master_zh_test鍚屾鏁版嵁琛2021_10_22_18_57_18 + 1銆佺涓鏈熷彉韬崱鎶鑳 v1.0.68 - 1銆佹坊鍔犱富瑙掓妧鑳 - 2. 琚姩199淇敼 -master_zh_test鍚屾鏁版嵁琛2021_10_18_11_00_42 -master_zh_test鍚屾鏁版嵁琛2021_10_16_19_07_28 -master_zh_test鍚屾鏁版嵁琛2021_10_16_19_06_48 + 1銆佺涓夋湡绁為瓊鎶鑳 + 2. 鏂版硶瀹濇妧鑳 +master_zh_online_special鍚屾鏁版嵁琛2021_11_23_15_58_01 v1.0.67 + 1銆佷慨澶嶅墠鍚庣鎴樻枟鏁版嵁鏍煎紡涓嶄竴鑷村鑷寸殑缁撴灉涓嶄竴鑷 +master_zh_online_special鍚屾鏁版嵁琛2021_11_16_14_56_55 +v1.0.66 + 1 绗簩鏈熺榄傛妧鑳 +master_zh_online_special鍚屾鏁版嵁琛2021_11_09_11_57_57 +master_zh_online_special鍚屾鏁版嵁琛2021_11_09_11_57_46 +master_zh_online_special鍚屾鏁版嵁琛2021_11_02_14_08_41 +v1.0.65 + 1 琚姩180淇敼 + 2. 鐏靛吔妫娴嬮昏緫鍒濆鍖栦慨鏀 +master_zh_online_special鍚屾鏁版嵁琛2021_10_26_16_05_44 +v1.0.64 + 1 娣诲姞涓昏鎶鑳 + 2. 琚姩119淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_10_19_16_13_17 +v1.0.63 1銆佽鍔344娣诲姞绌哄垽鏂 2. 鎴樻枟鍔涘叕寮忎慨鏀 -master_zh_test鍚屾鏁版嵁琛2021_10_12_15_58_23 -master_zh_test鍚屾鏁版嵁琛2021_10_12_10_25_47 -master_zh_test鍚屾鏁版嵁琛2021_10_11_18_25_43 -v1.0.66 - 1銆佽鍔312淇敼 -master_zh_test鍚屾鏁版嵁琛2021_10_09_18_47_41 -master_zh_test鍚屾鏁版嵁琛2021_10_09_18_46_50 -v1.0.65 - 1銆佽鍔116 258 281 312 344 250淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_10_12_15_59_00 +master_zh_online_special鍚屾鏁版嵁琛2021_10_12_15_58_52 +master_zh_online_special鍚屾鏁版嵁琛2021_10_12_10_26_03 +master_zh_online_special鍚屾鏁版嵁琛2021_10_11_19_54_13 +master_zh_online_special鍚屾鏁版嵁琛2021_10_11_19_53_59 +v1.0.62 + 1銆佽鍔116 258 281 312 344 250锛312锛353 351 137淇敼 2. 绮惧崼鍊熺殑鎬掓皵涓嶄細鍥炲鎬掓皵 3. 娣诲姞涓嶅鐞嗗浼よ鍔ㄧ殑鏂规硶 -master_zh_test鍚屾鏁版嵁琛2021_09_28_17_45_03 -v1.0.64 - 1銆353 351 137 琚姩淇敼 - 2. 娣诲姞鑾峰彇娌℃湁鍑哄彂涓嶇伃鐨勭洰鏍 -master_zh_test鍚屾鏁版嵁琛2021_09_27_18_41_38 -v1.0.63 - 1銆353琚姩淇敼 -v1.0.62 - 1銆佹坊鍔犲尽鐢瞓uff - 2.娣诲姞鏈鍚庝竴鏈熺传搴滅鍗帮紝娣诲姞鐧介噾瑁呭琚姩 瑙夐啋琚姩淇敼 -master_zh_test鍚屾鏁版嵁琛2021_09_26_20_35_14 -master_zh_test鍚屾鏁版嵁琛2021_09_18_21_14_36 -master_zh_test鍚屾鏁版嵁琛2021_09_18_18_42_35 v1.0.61 + 1.鍚屾瀹㈡埛绔昏緫 +master_zh_online_special鍚屾鏁版嵁琛2021_09_28_18_03_42 +master_zh_online_special鍚屾鏁版嵁琛2021_09_28_14_34_53 +master_zh_online_special鍚屾鏁版嵁琛2021_09_18_21_22_03 +v1.0.60 1銆佹妧鑳芥槸鍚﹁兘閲婃斁 娣诲姞鏄惁鏈夋妧鑳界洰鏍囧垽鏂 2.琚姩196 200 188 淇敼 -master_zh_test鍚屾鏁版嵁琛2021_09_17_16_21_53 -master_zh_test鍚屾鏁版嵁琛2021_09_15_20_05_28 -master_zh_test鍚屾鏁版嵁琛2021_09_15_14_23_26 -master_zh_test鍚屾鏁版嵁琛2021_09_14_15_46_46 -master_zh_test鍚屾鏁版嵁琛2021_09_14_11_51_05 -v1.0.60 - 1銆佽鍔56淇敼 -master_zh_test鍚屾鏁版嵁琛2021_09_11_18_04_19 +master_zh_online_special鍚屾鏁版嵁琛2021_09_16_20_56_10 +master_zh_online_special鍚屾鏁版嵁琛2021_09_16_19_56_58 +master_zh_online_special鍚屾鏁版嵁琛2021_09_15_16_43_43 +master_zh_online_special鍚屾鏁版嵁琛2021_09_15_15_58_04 +master_zh_online_special鍚屾鏁版嵁琛2021_09_15_15_55_26 +master_zh_online_special鍚屾鏁版嵁琛2021_09_14_15_45_21 +master_zh_online_special鍚屾鏁版嵁琛2021_09_14_13_07_13 + v1.0.59 - 1銆佽鍔261 淇敼 -master_zh_test鍚屾鏁版嵁琛2021_09_10_18_24_51 + 1銆佽鍔56淇敼 琚姩261 淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_09_14_11_32_16 +master_zh_online_special鍚屾鏁版嵁琛2021_09_14_11_26_22 v1.0.58 1銆佷慨澶嶆柟娉曠己澶辨姤閿 v1.0.57 1銆佸皾璇曚慨澶嶅瓩鎮熺┖澶ф嫑涓嶄細澧炲姞浼ゅ鐨勯棶棰 2銆佹坊鍔犵敤浜巇ebug鐨刲og -master_zh_test鍚屾鏁版嵁琛2021_09_07_11_00_31 +master_zh_online_special鍚屾鏁版嵁琛2021_09_07_10_58_24 v1.0.56 1.閫夌敓鍛界櫨鍒嗘瘮鏈灏戠洰鏍囬昏緫淇敼 鍘绘帀鏈変笉鐏崟浣 - 2. 姝讳骸涓嶆妸鎬掓皵鏄剧ず娓呯┖ - 3.琚姩99 307 閫夌洰鏍囬昏緫淇敼 + 2. 姝讳骸涓嶆妸鎬掓皵鏄剧ず娓呯┖ + 3.琚姩99 307 閫夌洰鏍囬昏緫淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_09_03_15_16_49 v1.0.55 - 1.琚姩263 269 274 332 112 145 淇敼 - 2. 娣诲姞鎴樻枟鏃ュ織 + 1. 琚姩263 269 274 332 112 145 淇敼 + 2. 娣诲姞鎴樻枟鏃ュ織 + +master_zh_online_special鍚屾鏁版嵁琛2021_08_28_19_41_53 v1.0.54 1. 琚姩91 琚姩115 160淇敼 - 2. Dot绫籦uff娓呴櫎閫昏緫淇敼 -master_zh_test鍚屾鏁版嵁琛2021_08_27_18_25_18 -master_zh_test鍚屾鏁版嵁琛2021_08_21_16_34_06 -v1.0.54 - 1. 琚姩141 310 283 330 336淇敼 -master_zh_test鍚屾鏁版嵁琛2021_08_02_19_27_29 + 2. Dot绫籦uff娓呴櫎閫昏緫淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_08_24_14_58_11 v1.0.53 - 1. 闅忔満绉嶅瓙淇敼 -master_zh_test鍚屾鏁版嵁琛2021_07_31_17_55_16 -master_zh_test鍚屾鏁版嵁琛2021_07_31_17_54_20 + 1. 琚姩141 310 283 330 336淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_08_03_10_38_57 v1.0.52 - 1. 姝讳骸鎶鑳戒笉浼氳鎺у埗 - 2.杩藉姞鎶鑳芥槸鍚﹁Е鍙戠壒鎬т慨鏀 -master_zh_test鍚屾鏁版嵁琛2021_07_26_11_10_56 + 1. 姝讳骸鎶鑳戒笉鍙楁帶鍒跺奖鍝 + 2.鎴樻枟闅忔満绉嶅瓙淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_07_28_08_34_36 v1.0.51 - 1. 琚姩292 淇敼 + 1. 琚姩292淇敼 +master_zh_online_special鍚屾鏁版嵁琛2021_07_16_19_57_49 v1.0.50 1. 琚姩292 319淇敼 - -master_zh_test鍚屾鏁版嵁琛2021_07_13_18_19_09 -master_zh_test鍚屾鏁版嵁琛2021_07_10_20_33_05 v1.0.49 1. 鍚屾瀹㈡埛绔昏緫 +master_zh_online_special鍚屾鏁版嵁琛2021_07_13_18_14_42 +master_zh_online_special鍚屾鏁版嵁琛2021_07_06_17_33_58 v1.0.48 1. 鏂板绱簻绁炲嵃琚姩鏁堟灉 v1.0.47 1. 鏂板鑻遍泟瑙夐啋琚姩 鍙 鍥伴毦鍓湰琚姩 鏁堟灉 - -master_zh_test鍚屾鏁版嵁琛2021_06_30_07_33_23 -master_zh_test鍚屾鏁版嵁琛2021_06_28_13_40_30 +master_zh_online_special鍚屾鏁版嵁琛2021_06_30_07_33_07 v1.0.46 1銆佸悓姝ユ暟鎹〃 v1.0.45 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java index f2272ff39..3a9bc0c20 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/SArenaRobotStaticConfig.java @@ -50,6 +50,7 @@ public class SArenaRobotStaticConfig extends AbstractClassStaticConfig { heroBuilder.setStar(star); heroBuilder.setStarBreakId(heroStarBreakId); heroBuilder.setBreakId(heroBreakId); + heroBuilder.setPropertyId(scHero.getPropertyName()); heroMap.put(heroTid,heroBuilder.build()); } sArenaRobotConfig.setHeroMapList(heroMap); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index 2bb9e2e65..7f90527dc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -122,6 +122,7 @@ public class BloodLogic { .setPosition(entry.getValue().getPosition()) .setStar(entry.getValue().getStar()) .setGodSoulLv(entry.getValue().getGodSoulLv()) + .setPropertyId(entry.getValue().getPropertyId()) .build(); heroDefendFightInfos.add(heroFightInfo); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 8c3b4d3ae..d5b5e19cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -584,6 +584,7 @@ public class FightUtil { .setProperty(property.substring(0, property.length() - 1)) .setPosition(++i) .setStar(heroStar) + .setPropertyId(item.getValue().getPropertyId()) .build(); heroFightInfos.add(heroFightInfo); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 852aa6e4a..45d7a44bf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -654,7 +654,15 @@ public class PlayerLogic { for(Map.Entry item : sArenaRobotConfig.getHeroMapList().entrySet()){ Integer heroTid = item.getKey(); Integer heroStar = item.getValue().getStar(); - teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).setPosition(position++).setGodSoulLv( item.getValue().getGodSoulLv()).build()); + teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder() + .setHeroid(String.valueOf(heroTid)) + .setHeroTid(heroTid) + .setLevel(sArenaRobotConfig.getRoleLv()) + .setStar(heroStar) + .setPosition(position++) + .setGodSoulLv( item.getValue().getGodSoulLv()) + .setPropertyId(item.getValue().getPropertyId()) + .build()); } oneInfo.setTeam(teamInfo); //TODO 鐜夎櫄璁洪亾涓夐槦浼