Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
commit
56f68bd9a2
|
|
@ -587,10 +587,10 @@ PropertyTypeIconDef = {
|
|||
-- [3] = "r_hero_wufang",
|
||||
-- [4] = "r_hero_kangxing",
|
||||
-- [5] = "r_hero_sudu",
|
||||
[1] = "r_hero_jinengdian05",
|
||||
[2] = "r_hero_jinengdian02",
|
||||
[3] = "r_hero_jinengdian04",
|
||||
[4] = "r_hero_jinengdian03",
|
||||
[1] = "r_hero_jinengdian02",
|
||||
[2] = "r_hero_jinengdian04",
|
||||
[3] = "r_hero_jinengdian03",
|
||||
[4] = "r_hero_jinengdian01",
|
||||
[5] = "r_hero_jinengdian01",
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7a2afc8316a24b4409c57cacabc7c648
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d122dbe862071b246bea615c75596cd8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 40e27352778e9f144876291f16c5e4f9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ae30b7299af35bb4c9fa8cf945996ee2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7c2bc10c35fbc0a48b0369faf88721fd
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 916ac039c4354a14ea78fe6791ae2ccf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 56c7f03f10a8a384595ae68f016b7d19
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 91373aebf904c144cab2b66c103d3a6c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7827f3ec919a55447bfb086d8091622e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -164,7 +164,8 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop)
|
|||
table.insert(itemData, v)
|
||||
-- allEquipNum = allEquipNum + v.num
|
||||
end
|
||||
itemNumText.text = Language[10188]..LengthOfTable(allEquipData).."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit
|
||||
--Language[10188]
|
||||
itemNumText.text = "装备种类:" ..LengthOfTable(allEquipData).."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit
|
||||
this:SetItemData(itemData, isTop)
|
||||
-- elseif _index == 0 then
|
||||
-- this:OnClickAllBtn()
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@ function this:OnClickAllBtn()
|
|||
this:SortEquipDatas(itemData)
|
||||
local count = 0
|
||||
for i=1,#itemData do
|
||||
count = count + itemData[i].num
|
||||
count = count + 1--itemData[i].num
|
||||
end
|
||||
--加上宝器数据
|
||||
local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.heroConfig.PropertyName)
|
||||
|
|
@ -784,7 +784,8 @@ function this:OnClickAllBtn()
|
|||
for i = 1, #curAllEquipTreasure do
|
||||
table.insert(itemData, curAllEquipTreasure[i])
|
||||
end
|
||||
this.itemNumText.text = Language[10188] .. count + LengthOfTable(curAllEquipTreasure)
|
||||
--Language[10188]
|
||||
this.itemNumText.text = "装备种类:" .. count + LengthOfTable(curAllEquipTreasure)
|
||||
this:SetItemData(itemData)
|
||||
end
|
||||
|
||||
|
|
@ -796,9 +797,10 @@ function this:OnClickTabBtn(_index)
|
|||
this:SortEquipDatas(allEquip)
|
||||
local count = 0
|
||||
for i=1,#allEquip do
|
||||
count = count + allEquip[i].num
|
||||
count = count + 1--allEquip[i].num
|
||||
end
|
||||
this.itemNumText.text = Language[10188] .. count
|
||||
--Language[10188]
|
||||
this.itemNumText.text = "装备种类:" .. count
|
||||
this:SetItemData(allEquip)
|
||||
else
|
||||
local allEquipTreasure
|
||||
|
|
@ -818,7 +820,8 @@ function this:OnClickTabBtn(_index)
|
|||
end
|
||||
end
|
||||
)
|
||||
this.itemNumText.text = Language[10188] .. LengthOfTable(allEquipTreasure)
|
||||
--Language[10188]
|
||||
this.itemNumText.text = "装备种类:" .. LengthOfTable(allEquipTreasure)
|
||||
this:SetItemData(allEquipTreasure)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ function this:OnOpen(_mapData)
|
|||
end
|
||||
LogGreen(#allEffect)
|
||||
for i = 1, #allEffect do
|
||||
Util.AddParticleSortLayer(allEffect[i], self.sortingOrder)
|
||||
Util.SetParticleSortLayer(allEffect[i], self.sortingOrder+1)
|
||||
end
|
||||
end
|
||||
local npc
|
||||
|
|
@ -634,6 +634,7 @@ function this:OnShow()
|
|||
end
|
||||
|
||||
function this:OnSortingOrderChange()
|
||||
LogGreen("self.sortingOrder:"..self.sortingOrder)
|
||||
Util.AddParticleSortLayer(this.moneyEffect, self.sortingOrder - cursortingOrder)
|
||||
for i = 1, #allEffect do
|
||||
Util.AddParticleSortLayer(allEffect[i], self.sortingOrder - cursortingOrder)
|
||||
|
|
|
|||
Loading…
Reference in New Issue