parent
453216c6c7
commit
1269b5b114
|
@ -158,6 +158,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 531690777}
|
||||
- component: {fileID: 531690778}
|
||||
- component: {fileID: 2138856117389309488}
|
||||
m_Layer: 5
|
||||
m_Name: grid
|
||||
m_TagString: Untagged
|
||||
|
@ -172,18 +173,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 531690776}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1623916009}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 5680257784138935959}
|
||||
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_AnchoredPosition: {x: -5.45, y: -90.2}
|
||||
m_SizeDelta: {x: 827.5, y: 371.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -390.7494, y: 186.45001}
|
||||
m_SizeDelta: {x: 781.5, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &531690778
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -197,17 +198,31 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 59
|
||||
m_Left: 40
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Top: 11
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 150, y: 150}
|
||||
m_Spacing: {x: 29, y: 28.3}
|
||||
m_Spacing: {x: 36.68, y: 2.36}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 4
|
||||
--- !u!114 &2138856117389309488
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 531690776}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &753002027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -828,7 +843,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1946809060}
|
||||
- {fileID: 1589414895}
|
||||
- {fileID: 531690777}
|
||||
- {fileID: 5680257784138935959}
|
||||
- {fileID: 6322198127485678409}
|
||||
- {fileID: 801832922018237753}
|
||||
m_Father: {fileID: 6100468993864897443}
|
||||
|
@ -20960,7 +20975,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -2214, y: 0}
|
||||
m_SizeDelta: {x: 164, y: 164}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7249126726799923180
|
||||
CanvasRenderer:
|
||||
|
@ -21074,6 +21089,88 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5079776987774873793
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5680257784138935959}
|
||||
- component: {fileID: 3567647121687423662}
|
||||
- component: {fileID: 4649260478566180948}
|
||||
m_Layer: 5
|
||||
m_Name: scroll
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5680257784138935959
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5079776987774873793}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 531690777}
|
||||
m_Father: {fileID: 1623916009}
|
||||
m_RootOrder: 2
|
||||
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: -17.700012, y: -72.3999}
|
||||
m_SizeDelta: {x: 781.5, y: 372.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3567647121687423662
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5079776987774873793}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 531690777}
|
||||
m_Horizontal: 0
|
||||
m_Vertical: 1
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 0}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: 0
|
||||
m_VerticalScrollbarSpacing: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &4649260478566180948
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5079776987774873793}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5432803838214946728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -374,7 +374,12 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
end
|
||||
elseif _itemData.itemConfig.ItemType == ItemType.likeabilityItem then
|
||||
fragmentIcon.gameObject:SetActive(true)
|
||||
fragmentIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(_itemData.itemConfig.PropertyName))
|
||||
if _itemData.itemConfig.PropertyName > 0 then
|
||||
fragmentIcon.gameObject:SetActive(true)
|
||||
fragmentIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(_itemData.itemConfig.PropertyName))
|
||||
else
|
||||
fragmentIcon.gameObject:SetActive(false)
|
||||
end
|
||||
elseif _itemData.itemConfig.ItemType == ItemType.Pokemon then
|
||||
Util.GetGameObject(_go.gameObject, "GameObject/item/frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(YaoHunFrame[_itemData.quality])
|
||||
num:SetActive(false)
|
||||
|
|
|
@ -56,7 +56,7 @@ function HeroLikeAbilityPanel:InitComponent()
|
|||
self.progressText = Util.GetGameObject(self.transform, "likeability/progressText"):GetComponent("Text")
|
||||
self.lookBtn = Util.GetGameObject(self.transform, "likeability/lookBtn")
|
||||
|
||||
self.grid = Util.GetGameObject(self.transform, "gift/grid")
|
||||
self.grid = Util.GetGameObject(self.transform, "gift/scroll/grid")
|
||||
self.itemPre = Util.GetGameObject(self.transform, "gift/itemPre")
|
||||
self.select = Util.GetGameObject(self.transform, "gift/select")
|
||||
self.remainTimes = Util.GetGameObject(self.transform, "remainTimes"):GetComponent("Text")
|
||||
|
@ -317,7 +317,7 @@ function HeroLikeAbilityPanel:UpdateItemList(isChange)
|
|||
self.itemList[i].data = items[i]
|
||||
end
|
||||
self.itemList[i].pre.gameObject:SetActive(true)
|
||||
self.itemList[i].go:OnOpen(false,{items[i].id,items[i].num},1.1,false,false,false,self.sortingOrder)
|
||||
self.itemList[i].go:OnOpen(false,{items[i].id,items[i].num},1,false,false,false,self.sortingOrder)
|
||||
if items[i].num < 1 then
|
||||
Util.SetGray(self.itemList[i].pre.gameObject,true)
|
||||
else
|
||||
|
@ -358,7 +358,7 @@ end
|
|||
function HeroLikeAbilityPanel:SetSelectKuang(par)
|
||||
self.select.gameObject:SetActive(true)
|
||||
self.select.transform:SetParent(par.transform)
|
||||
self.select.transform.localPosition = Vector3.zero
|
||||
self.select.transform.localPosition = Vector3.New(-7.5,3.5)
|
||||
end
|
||||
|
||||
function HeroLikeAbilityPanel:SetHeroLiveData()
|
||||
|
|
|
@ -89,6 +89,7 @@ function this.GetAllItemsData()
|
|||
data.num = BagManager.GetItemCountById(k)
|
||||
data.id = k
|
||||
data.property = ItemConfig[k].PropertyName
|
||||
data.Quantity = ItemConfig[k].Quantity
|
||||
table.insert(list,data)
|
||||
end
|
||||
table.sort(list,function(a,b)
|
||||
|
|
|
@ -432,7 +432,12 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
end)
|
||||
elseif itemDataConFig.ItemType == ItemType.likeabilityItem then
|
||||
self.fragmentIcon:SetActive(true)
|
||||
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[itemSId].PropertyName))
|
||||
if itemConfig[itemSId].PropertyName > 0 then
|
||||
self.fragmentIcon.gameObject:SetActive(true)
|
||||
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[itemSId].PropertyName))
|
||||
else
|
||||
self.fragmentIcon.gameObject:SetActive(false)
|
||||
end
|
||||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
|
|
Loading…
Reference in New Issue