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

dev_chengFeng
jiaoyangna 2020-07-30 16:03:37 +08:00
commit ca080676df
11 changed files with 25 additions and 19 deletions

View File

@ -176,9 +176,9 @@ RectTransform:
m_Father: {fileID: 224081220488562528} m_Father: {fileID: 224081220488562528}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -540.0001, y: -960.0001} m_AnchoredPosition: {x: 539.9999, y: -960.0001}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1551019693790370 --- !u!1 &1551019693790370

View File

@ -28280,10 +28280,10 @@ MonoBehaviour:
m_Right: 0 m_Right: 0
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 3 m_ChildAlignment: 1
m_StartCorner: 0 m_StartCorner: 0
m_StartAxis: 0 m_StartAxis: 0
m_CellSize: {x: 560, y: 50} m_CellSize: {x: 500, y: 50}
m_Spacing: {x: 30, y: 0} m_Spacing: {x: 30, y: 0}
m_Constraint: 0 m_Constraint: 0
m_ConstraintCount: 2 m_ConstraintCount: 2
@ -43106,10 +43106,10 @@ RectTransform:
m_Father: {fileID: 2689199158799360139} m_Father: {fileID: 2689199158799360139}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2691604319409928151 --- !u!222 &2691604319409928151
CanvasRenderer: CanvasRenderer:
@ -43482,7 +43482,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000015258789} m_AnchoredPosition: {x: 0, y: -0.000045776367}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &2871929161858473383 --- !u!114 &2871929161858473383

View File

@ -47,8 +47,8 @@ local jumpDic = {
end end
end, end,
[JumpType.Arena] = function(data)--竞技场 [JumpType.Arena] = function(data)--竞技场
-- local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) -- local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK)
--首次进入竞技场 将主线编队复制到竞技场防守、进攻编队 --首次进入竞技场 将主线编队复制到竞技场防守、进攻编队
-- if #arenaAttack.teamHeroInfos==0 then -- if #arenaAttack.teamHeroInfos==0 then

View File

@ -46,22 +46,28 @@ function this:OnShow(_parent,...)
local var local var
if _args[1] == RecruitType.Single then if _args[1] == RecruitType.Single then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten
this.rootText.text = "确认花费200妖晶进行1次神将召唤" local d=RecruitManager.GetExpendData(RecruitType.Single)
this.rootText.text = string.format("确认花费%s妖晶进行1次神将召唤",d[2])
elseif _args[1] == RecruitType.QianKunBoxSingle then elseif _args[1] == RecruitType.QianKunBoxSingle then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen
this.rootText.text = "确认花费200妖晶抽取1次乾坤宝盒" local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle)
this.rootText.text = string.format("确认花费%s妖晶抽取1次乾坤宝盒",d[2])
elseif _args[1] == RecruitType.TimeLimitSingle then elseif _args[1] == RecruitType.TimeLimitSingle then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen
this.rootText.text = "确认花费200妖晶进行1次限时召唤 " local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle)
this.rootText.text = string.format("确认花费%s妖晶进行1次限时召唤",d[2])
elseif _args[1] == RecruitType.Ten then elseif _args[1] == RecruitType.Ten then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten
this.rootText.text = "确认花费2000妖晶进行10次神将召唤" local d=RecruitManager.GetExpendData(RecruitType.Ten)
this.rootText.text = string.format("确认花费%s妖晶进行10次神将召唤",d[2])
elseif _args[1] == RecruitType.QianKunBoxTen then elseif _args[1] == RecruitType.QianKunBoxTen then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen
this.rootText.text = "确认花费2000妖晶抽取10次乾坤宝盒" local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen)
this.rootText.text = string.format("确认花费%s妖晶抽取10次乾坤宝盒",d[2])
elseif _args[1] == RecruitType.TimeLimitTen then elseif _args[1] == RecruitType.TimeLimitTen then
var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen
this.rootText.text = "确认花费2000妖晶进行10次限时召唤" local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen)
this.rootText.text = string.format("确认花费%s妖晶进行10次限时召唤",d[2])
end end
Util.AddOnceClick(this.btn,function() Util.AddOnceClick(this.btn,function()

View File

@ -68,7 +68,7 @@ end
--刷新招募红点 --刷新招募红点
function this.CheckRecuritRedPoint() function this.CheckRecuritRedPoint()
if (this.freeUseTimeList[14] >= 1) then if (PrivilegeManager.GetPrivilegeRemainValue(14) >= 1) then--this.freeUseTimeList[14])
return true return true
else else
return false return false
@ -77,7 +77,7 @@ end
--刷新普通招募红点 --刷新普通招募红点
function this.CheckRecuritNormalPoint() function this.CheckRecuritNormalPoint()
if (this.freeUseTimeList[38] >= 1) then if (PrivilegeManager.GetPrivilegeRemainValue(38) >= 1) then--this.freeUseTimeList[38]
return true return true
else else
return false return false