Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
606ecfe6b2
|
@ -16039,7 +16039,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 0.002321184, y: -0.0013351442}
|
||||
m_AnchoredPosition: {x: 43.999954, y: -0.0013351442}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1312317756811486
|
||||
|
@ -25816,7 +25816,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 547.0023, y: -42.001335}
|
||||
m_AnchoredPosition: {x: 605, y: -42.001335}
|
||||
m_SizeDelta: {x: 253.28, y: 72.94}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222612018330954196
|
||||
|
@ -26040,7 +26040,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 393.5, y: 55.6}
|
||||
m_AnchoredPosition: {x: 436.49997, y: 55.6}
|
||||
m_SizeDelta: {x: 492.4, y: 85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &114442577825503850
|
||||
|
@ -26246,7 +26246,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1434973737169448}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
|
@ -32198,7 +32198,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: 125.3, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 100.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222314792653266900
|
||||
|
@ -52938,7 +52938,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 158.75003, y: 35.169975}
|
||||
m_AnchoredPosition: {x: 201.75, y: 35.169975}
|
||||
m_SizeDelta: {x: 150.89, y: 181.69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222858965860625648
|
||||
|
@ -59005,7 +59005,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 436.89, y: 55.87995}
|
||||
m_AnchoredPosition: {x: 479.88998, y: 55.87995}
|
||||
m_SizeDelta: {x: 438.9, y: 50.25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7167172832424479137
|
||||
|
@ -67462,7 +67462,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 438, y: 313.2}
|
||||
m_AnchoredPosition: {x: 481, y: 313.2}
|
||||
m_SizeDelta: {x: 281.74, y: 49}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5738325346908728067
|
||||
|
@ -71015,7 +71015,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 438, y: 9}
|
||||
m_AnchoredPosition: {x: 480.99997, y: 9}
|
||||
m_SizeDelta: {x: 135, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5737686626442403801
|
||||
|
@ -72676,7 +72676,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -2, y: 0.00021362305}
|
||||
m_AnchoredPosition: {x: -2, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 911.7, y: 165}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2281102156788700535
|
||||
|
@ -73161,7 +73161,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 442, y: -57}
|
||||
m_AnchoredPosition: {x: 484.99997, y: -57}
|
||||
m_SizeDelta: {x: 562.1, y: 127.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8131174916755952753
|
||||
|
@ -78095,7 +78095,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 415.6, y: 56.428}
|
||||
m_AnchoredPosition: {x: 458.59998, y: 56.428}
|
||||
m_SizeDelta: {x: 438.29, y: 51.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5170435786110081326
|
||||
|
@ -79478,7 +79478,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 439, y: 179}
|
||||
m_AnchoredPosition: {x: 481.99997, y: 179}
|
||||
m_SizeDelta: {x: 767.9, y: 193.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8981899116021883810
|
||||
|
|
|
@ -635,6 +635,13 @@ function this.ItemsSortData(_itemDatas)
|
|||
return a.itemConfig.Quantity > b.itemConfig.Quantity
|
||||
end
|
||||
end
|
||||
if a.itemConfig.ItemType == ItemType.Equip and b.itemConfig.ItemType == ItemType.Equip then
|
||||
if a.itemConfig.Quantity == b.itemConfig.Quantity then
|
||||
return a.id > b.id
|
||||
else
|
||||
return a.itemConfig.Quantity > b.itemConfig.Quantity
|
||||
end
|
||||
end
|
||||
if a.itemConfig.ItemType == ItemType.HeroDebris and b.itemConfig.ItemType == ItemType.HeroDebris then
|
||||
local aNum = BagManager.GetItemCountById(a.itemConfig.Id) >= a.itemConfig.UsePerCount and 2 or 1
|
||||
local bNum = BagManager.GetItemCountById(b.itemConfig.Id) >= b.itemConfig.UsePerCount and 2 or 1
|
||||
|
|
|
@ -637,7 +637,7 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
|
|||
Util.ClearChild(this.itemGrid.transform)
|
||||
this.noUpLvText:SetActive(fFightEndLvUpPanelalse)
|
||||
this.upLv:SetActive(true)
|
||||
this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(547.0023, -42.00134 )
|
||||
this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(605, -42.00134 )
|
||||
isUpLvMaterials=true
|
||||
for i = 1, #costItemList do
|
||||
if costItemList[i][1]~=14 then
|
||||
|
|
Loading…
Reference in New Issue