Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-11-22 16:38:43 +08:00
commit 21fa0c1762
8 changed files with 32 additions and 11 deletions

View File

@ -8695,6 +8695,9 @@ local passivityList = {
if time==num then
return
end
if skill.owner.camp~=role.camp then
return
end
if skill.owner.element~=camp then
return
end

View File

@ -998,7 +998,11 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
end
-- 计算克制伤害系数
local MieKangFactor = 1 + atkRole:GetRoleData(BattleMieProp[defRole.element]) - defRole:GetRoleData(BattleKangProp[atkRole.element])
local MieKangFactor = 1
if atkRole.type == BattleUnitType.Role and defRole.type == BattleUnitType.Role then
MieKangFactor=MieKangFactor + atkRole:GetRoleData(BattleMieProp[defRole.element]) - defRole:GetRoleData(BattleKangProp[atkRole.element])
end
-- 公式伤害 = 基础伤害 * 基础伤害系数 * 增伤系数 * 爆伤系数 * 克制伤害系数
local fixDamage = floor(BattleUtil.FP_Mul(baseDamage, baseFactor, addDamageFactor, critDamageFactor, MieKangFactor))

View File

@ -62,7 +62,7 @@ function this:GetSkipState()
if AppConst.isOpenGM then
return SKIP_STATE.UNLOCK
end
LogError("fightType "..fightType)
-- LogError("fightType "..fightType)
if UpdateBtnGMFunc[fightType] then
return UpdateBtnGMFunc[fightType]()
else
@ -518,11 +518,13 @@ function this.ShowBattleResult(result, msg)
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.DEATH_POS then-- 十绝阵结算界面特殊显示
this.ShowBattleResultByDeathPos()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.BACK or BattleManager.GetLastBattleType() == BATTLE_TYPE.ARENA then
this:ClosePanel()
this:ClosePanel()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.TASUILINGXIAO then
this.ShowBattleResultByTaSuiLingXiao()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.JumpServerhightLadder then
this.ShowBattleResultByJumpServerHightLadder(result)
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.LINGMAIMIJING then
this:ClosePanel()
else
if result == 0 then -- 失败
local haveRecord = BattleRecordManager.isHaveRecord()

View File

@ -32,7 +32,12 @@ function this:OnShow(_parent)
self.data = LingMaiMiJingManager.recordData
if #self.data > 0 then
self.empty:SetActive(false)
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
for i = 1, #this.recordData do
if this.recordData[i].time == 1 then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
break
end
end
else
self.empty:SetActive(true)
PlayerPrefs.SetString(PlayerManager.uid.."LingMai","")

View File

@ -138,16 +138,20 @@ function this.CheckRedPoint()
if not PlayerPrefs.GetString(PlayerManager.uid.."LingMai") then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "")
end
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time) then
return true
for i = 1, #this.recordData do
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time) and this.recordData[i].time == 1 then
return true
end
end
end
return false
end
function this.CheckRecord()
if this.recordData[1] then
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time)
for i = 1, #this.recordData do
if this.recordData[i].time == 1 then
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time)
end
end
return false
end

View File

@ -210,7 +210,7 @@ function LingMaiMiJingPanel:SetVeins()
end
Util.AddOnceClick(go,function ()
if LingMaiMiJingManager.state == 1 then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.serverName and data.serverName or nil,data)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.servername and data.servername or nil,data)
else
PopupTipPanel.ShowTip("<color=red>灵脉秘境未开启!</color>")
end

View File

@ -78,7 +78,10 @@ local this = GMPanel
"1#60198#6","1#60199#6","1#60201#6","1#60161#6","1#60162#6","1#60163#6","1#60164#6","1#60165#6","1#60166#6","1#60186#6","1#60187#6","1#60188#6","1#60189#6",
"1#60178#6","1#60179#6","1#60202#6","1#60203#6","1#60204#6","1#60205#6","1#60206#6","1#60207#6","1#60208#6","1#60209#6","1#60210#6","1#60211#6","1#60212#6","1#60213#6",
}
local moneyList = {"1#14#2000000000","1#16#2000000000","1#74#99999", "1#87#99999", "1#1226#99999999", "1#5000050#99", "1#20007#10", "1#1203#10000", "1#3#500000000", "1#4#9999999", "1#20#999999",}
local moneyList = {"1#14#100000000","1#16#100000000","1#4#100000000","1#19#100000000","1#20#100000000","1#21#100000000","1#23#100000000","1#26#100000000","1#29#100000000","1#32#100000000","1#66#100000000",
"1#69#100000000","1#74#100000000","1#79#100000000","1#80#100000000","1#87#100000000","1#1001#100000000","1#1201#100000000","1#1202#100000000","1#1203#100000000","1#1204#100000000",
"1#1205#100000000","1#1206#100000000","1#1207#100000000","1#1208#100000000","1#1210#100000000","1#1211#100000000","1#1220#100000000","1#1228#100000000"
,"1#1229#100000000","1#1230#100000000","1#1231#100000000","1#1232#100000000","1#1240#100000000","1#1241#100000000","1#1242#100000000","1#1273#100000000"}
--初始化组件(用于子类重写)
function GMPanel:InitComponent()
this.spLoader = SpriteLoader.New()

View File

@ -445,7 +445,7 @@ function this.RefreshBtnShow()
this.btnBox:SetActive(true)
-- 按钮功能
local btnType = this._Config.btnType
local btnType = this._Config.btnType or {}
for index, btn in ipairs(this.btnList) do
btn:SetActive(btnType[index] ~= nil)
if btnType[index] then