Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-08-26 15:51:41 +08:00
commit ec45a9688d
9 changed files with 12 additions and 9 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1023 KiB

After

Width:  |  Height:  |  Size: 1024 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 971 KiB

After

Width:  |  Height:  |  Size: 1021 KiB

View File

@ -1410,7 +1410,7 @@ HELP_TYPE = {
TreasureResolve=60, --宝物分解
HeroReplacement=61,--神将置换
HeroCompound=62,--神将合成
XuanYuanMirror=63,--轩辕宝镜
TalismanResolve=63,--法宝归元
XuanYuanMirror=66,--轩辕宝镜
GuildTranscripe=67,--公会副本
QingLongSerectTreasure=68,--青龙秘宝

View File

@ -2386,4 +2386,5 @@
[12385] = "五星成长礼",
[12386] = "极速排名",
[12387] = "军团副本",
[12388] = "该神将在巅峰战阵容中已上阵",
}

View File

@ -209,7 +209,6 @@ function BattleUtil.ChooseTarget(role, chooseId)
elseif chooseWeight == 7 then -- 对位及其相邻目标
arr = RoleManager.GetNeighbor(role, chooseType)
elseif chooseWeight == 8 then -- 对位
LogError("选择对位")
if num==1 then
arr=RoleManager.GetAggroHero(role,arr)
else
@ -222,7 +221,6 @@ function BattleUtil.ChooseTarget(role, chooseId)
-- if sort == 1 then return r1 > r2 else return r1 < r2 end
-- end)
end
LogError(#arr)
local finalArr = {}
if num == 0 then
finalArr = arr
@ -354,8 +352,7 @@ end
--检测是否有是金翅大鹏有不灭效果
function BattleUtil.CheckIsNoDead(target)
if target then
LogError(target.star)
return BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)==false and target:IsAssignHeroAndHeroStar(10086,10)==false
return target:IsAssignHeroAndHeroStar(10086,10)==false and BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)==false
end
return false
end

View File

@ -117,11 +117,15 @@ function FirstRechargePanel:OnOpen(context,_fun)
self.frame:SetActive(false)
self.effect:SetActive(false)
self.ani.enabled = false
self.closeBtn:GetComponent("Button").enabled = false
Timer.New(function ()
self.frame:SetActive(true)
self.effect:SetActive(true)
self.ani.enabled = true
end, 1.5):Start()
Timer.New(function ()
self.closeBtn:GetComponent("Button").enabled = true
end, 2.5):Start()
end
function FirstRechargePanel:OnShow()

View File

@ -355,7 +355,7 @@ function this.GetHeroFormationStr(teamId)
return Language[11108]
-- 1001
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
return Language[12280]
return Language[12388]
end
end
return ""

View File

@ -161,7 +161,8 @@ function this:topBar()
Util.GetGameObject(this.openExtra,"MeiKaiQi"):SetActive(true)
this.openExtra:GetComponent("Animator").enabled = true
Timer.New(function()
NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg)
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
NetManager.GetActivityRewardRequest(-2,id,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
PopupTipPanel.ShowTip(Language[12355])
Timer.New(function()
@ -275,7 +276,7 @@ function this:OnBtnDealClicked(rewardItem,rewardSingleData)
if rewardSingleData.state ~= -2 then--分数达到要求
if (rewardSingleData.state == 0) or--任务未领取
(rewardSingleData.state == 1 and treasureState > 0) then--任务未领取+礼包已购买
local id = ActivityGiftManager.GetActivityIdByType(8)
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
LogBlue("activityId:"..id)
NetManager.GetActivityRewardRequest(rewardSingleData.level,id,function(msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1)

View File

@ -31,7 +31,7 @@ end
function this:BindEvent()
Util.AddClick(this.helpBtn,function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Resolve_Recall,this.helpPos.x,this.helpPos.y)
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TalismanResolve,this.helpPos.x,this.helpPos.y)
end)
Util.AddClick(this.confirmBtn,function()
if tonumber(LengthOfTable(selectHeroData))==0 then