Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
commit
a6f1259075
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 59fd2c41c701769469cfde00d29f002a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dbbb2d6fb9cf0c844b400b516788fcd0
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -2571,7 +2571,7 @@ RectTransform:
|
|||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
@ -4708,7 +4708,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 166.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5694755251873320187
|
||||
|
@ -5603,7 +5603,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 71, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 62.98}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &4590255205679847234
|
||||
|
@ -8577,10 +8577,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7435143058469024522}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 12, y: -120}
|
||||
m_SizeDelta: {x: -62.2, y: -229.9}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -120}
|
||||
m_SizeDelta: {x: 1080, y: -229.9}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &6527458355414288168
|
||||
CanvasRenderer:
|
||||
|
@ -8769,7 +8769,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6436517551977973289
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -10712,8 +10712,8 @@ RectTransform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
@ -18431,10 +18431,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4982919456788885506}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5371694410511502372
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -1116,7 +1116,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -37.3}
|
||||
m_AnchoredPosition: {x: 0, y: -108}
|
||||
m_SizeDelta: {x: -22.1, y: -136.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6076744255811928556
|
||||
|
|
|
@ -55,6 +55,7 @@ local _TabData={ [1] = { default = "r_richang_anniu_jinbi_01", select = "r_richa
|
|||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1),
|
||||
lock=Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
|
||||
local maxForce = 0
|
||||
|
||||
function DailyCarbonPanel:InitComponent()
|
||||
this.panel=Util.GetGameObject(this.gameObject,"Panel")
|
||||
|
@ -114,6 +115,13 @@ function DailyCarbonPanel:OnOpen(_carbonIndex)
|
|||
end
|
||||
|
||||
function DailyCarbonPanel:OnShow()
|
||||
local curFormationForce = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
if PlayerManager.maxForce < curFormationForce then
|
||||
PlayerManager.maxForce = curFormationForce
|
||||
end
|
||||
maxForce = PlayerManager.maxForce
|
||||
|
||||
|
||||
if carbonIndex==0 then carbonIndex=1 end
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetTabIsLockCheck(this.TabIsLockCheck)
|
||||
|
@ -216,7 +224,7 @@ function this.SetData(root, data, ldata)
|
|||
local isOpen = (not ldata or CarbonManager.IsDailyCarbonPass(ldata.Id)) -- 上一个副本解锁
|
||||
and PlayerManager.level >= _lv -- 等级
|
||||
and (_point == 0 or FightPointPassManager.IsFightPointPass(_point))
|
||||
and PlayerManager.maxForce >= _power -- 战斗力
|
||||
and maxForce >= _power -- 战斗力
|
||||
--显示挑战或扫荡道具消耗
|
||||
goIcon:SetActive(isOpen and freeTime<=0)
|
||||
goIconNum:SetActive( isOpen and freeTime<=0)
|
||||
|
@ -249,7 +257,7 @@ function this.SetData(root, data, ldata)
|
|||
if PlayerManager.level<_lv then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10340],_lv))
|
||||
return
|
||||
elseif PlayerManager.maxForce < _power then
|
||||
elseif maxForce < _power then
|
||||
PopupTipPanel.ShowTip(string.format(Language[12219], _power))
|
||||
return
|
||||
elseif _point ~= 0 and not FightPointPassManager.IsFightPointPass(_point) then
|
||||
|
@ -271,6 +279,7 @@ function this.SetData(root, data, ldata)
|
|||
return
|
||||
end
|
||||
|
||||
|
||||
--检测妖晶数量
|
||||
local itemId=storeData.Cost[1][1] --消耗道具
|
||||
if BagManager.GetItemCountById(itemId)<storeData.Cost[2][4] and freeTime<=0 then
|
||||
|
|
|
@ -37,6 +37,7 @@ function HandBookHeroAndEquipListPanel:InitComponent()
|
|||
--英雄
|
||||
self.heroScroll = Util.GetGameObject(self.transform, "heroScroll")
|
||||
self.heroScrollbar = Util.GetGameObject(self.transform, "heroScrollbar")
|
||||
self.heroScrollbar.gameObject:SetActive(false)
|
||||
self.card = poolManager:LoadAsset("card", PoolManager.AssetType.GameObject)
|
||||
self.card.transform:SetParent(self.transform)
|
||||
self.card:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
|
||||
|
@ -51,6 +52,7 @@ function HandBookHeroAndEquipListPanel:InitComponent()
|
|||
self.heroprefab, Vector2.New(1080, rootHight - 10), 1, 17)
|
||||
sv.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, -5)
|
||||
-- 保存
|
||||
sv.moveTween.Strength = 5
|
||||
self.SystemScrollView = sv
|
||||
|
||||
--装备
|
||||
|
@ -145,7 +147,7 @@ function HandBookHeroAndEquipListPanel:OnShow()
|
|||
proId = 0
|
||||
if OpenType == 1 then
|
||||
self.heroScroll:SetActive(true)
|
||||
self.heroScrollbar:SetActive(true)
|
||||
self.heroScrollbar:SetActive(false)
|
||||
self.equipScroll:SetActive(false)
|
||||
self.equipScrollbar:SetActive(false)
|
||||
self.talismanScroll:SetActive(false)
|
||||
|
@ -189,6 +191,13 @@ function HandBookHeroAndEquipListPanel:OnSortingOrderChange()
|
|||
orginLayer = self.sortingOrder
|
||||
end
|
||||
|
||||
function HandBookHeroAndEquipListPanel:Clone(_t)
|
||||
local res = {}
|
||||
res = _t
|
||||
return res
|
||||
end
|
||||
|
||||
|
||||
function HandBookHeroAndEquipListPanel:GetHeroData()
|
||||
--得到所有的对应星级的英雄
|
||||
local tenHeroList = {}
|
||||
|
@ -241,14 +250,15 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
|
|||
for k,v in pairs(herodatas) do
|
||||
temp = 0
|
||||
if v and #v > 0 then
|
||||
LogGreen("star:"..k.." heroCount:"..#v.." HeroHaveNum:"..heroNumList[k])
|
||||
--LogGreen("star:"..k.." heroCount:"..#v.." HeroHaveNum:"..heroNumList[k])
|
||||
local str = Language[11096]..heroNumList[k].."/"..#v
|
||||
table.insert(heroScrolldatas,{type = 2,star = k,index = 0,content = str })
|
||||
for i = 1,#v do
|
||||
if i%5 == 0 or i == #v then
|
||||
local tempData = {}
|
||||
for n = 1, i - temp do
|
||||
for n = temp + 1, i do
|
||||
table.insert(tempData,v[n])
|
||||
--LogBlue("v[n].id:"..v[n].Id)
|
||||
end
|
||||
if i%5 ==0 then
|
||||
table.insert(heroScrolldatas,{type = 1,star = k,index = math.floor(i/5), content = tempData})
|
||||
|
@ -271,14 +281,14 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
|
|||
return a.star > b.star
|
||||
end
|
||||
end)
|
||||
for k,v in ipairs(heroScrolldatas) do
|
||||
if v.content and v.type ==1 then
|
||||
LogPink("star:"..v.star.." heroCount:"..#v.content.." index:"..v.index)
|
||||
for n,m in ipairs(v.content) do
|
||||
LogYellow("m.Id:"..m.Id.."m.Star:"..m.Star)
|
||||
end
|
||||
end
|
||||
end
|
||||
-- for k,v in ipairs(heroScrolldatas) do
|
||||
-- if v.content and v.type ==1 then
|
||||
-- LogPink("star:"..v.star.." heroCount:"..#v.content.." index:"..v.index)
|
||||
-- for n,m in ipairs(v.content) do
|
||||
-- LogYellow("m.Id:"..m.Id.."m.Star:"..m.Star)
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
return heroScrolldatas
|
||||
end
|
||||
|
||||
|
@ -327,7 +337,7 @@ function HandBookHeroAndEquipListPanel:OnShowHeroFun()
|
|||
self:SetSelectBtn()
|
||||
local data = self:GetHeroData()
|
||||
self.SystemScrollView:SetData(data, function(dataIndex, go)
|
||||
LogYellow("dataIndex:"..dataIndex)
|
||||
--LogYellow("dataIndex:"..dataIndex)
|
||||
self:showData(go,data[dataIndex])
|
||||
end,1)
|
||||
|
||||
|
@ -624,6 +634,8 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
|
|||
else
|
||||
lv = 1
|
||||
end
|
||||
Util.GetGameObject(_go.transform, "card/choosed").gameObject:SetActive(false)
|
||||
Util.GetGameObject(_go.transform, "card/redAndLock").gameObject:SetActive(false)
|
||||
SetHeroBg(Util.GetGameObject(_go.transform, "card"), Util.GetGameObject(_go.transform, "card/bg"),star,heroData.Quality)
|
||||
|
||||
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = lv
|
||||
|
|
|
@ -87,7 +87,7 @@ function this:OnShow(_parent,...)
|
|||
local _args = {...}
|
||||
|
||||
itemId=trialSetting[1].BombId[1][1]
|
||||
itemNum= BagManager.GetItemCountById(itemId)
|
||||
itemNum= BagManager.GetTotalItemNum(itemId)
|
||||
usedNum=MapTrialManager.bombUsed
|
||||
this.RefreshPanel()
|
||||
end
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue