Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
02ec865150
|
@ -5081,9 +5081,9 @@ 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: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 316.40005, y: -73.150055}
|
m_AnchoredPosition: {x: 0.000057485686, y: -73.150055}
|
||||||
m_SizeDelta: {x: 0, y: 151}
|
m_SizeDelta: {x: 0, y: 151}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &5729675956691850897
|
--- !u!114 &5729675956691850897
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -19668,9 +19668,9 @@ 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: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 316.40002, y: -73.150055}
|
m_AnchoredPosition: {x: 0.000028742843, y: -73.150055}
|
||||||
m_SizeDelta: {x: 0, y: 151}
|
m_SizeDelta: {x: 0, y: 151}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &4796361513380277662
|
--- !u!114 &4796361513380277662
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -43979,80 +43979,6 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &6406938328886149404
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 3122847029739947333}
|
|
||||||
- component: {fileID: 9172115513959909474}
|
|
||||||
- component: {fileID: 6269553500272781496}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Image
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &3122847029739947333
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6406938328886149404}
|
|
||||||
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: 2931217454655974565}
|
|
||||||
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: 0, y: 0}
|
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &9172115513959909474
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6406938328886149404}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &6269553500272781496
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6406938328886149404}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 0.8}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
|
||||||
m_Sprite: {fileID: 0}
|
|
||||||
m_Type: 0
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
--- !u!1 &6801484805305654314
|
--- !u!1 &6801484805305654314
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -94,6 +94,7 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId)
|
||||||
this.shopType = shopType
|
this.shopType = shopType
|
||||||
this.shopItemId = shopItemId
|
this.shopItemId = shopItemId
|
||||||
this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId)
|
this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId)
|
||||||
|
LogGreen(shopItemId..":shopItemId")
|
||||||
this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId)
|
this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId)
|
||||||
|
|
||||||
-- 商品基础信息显示
|
-- 商品基础信息显示
|
||||||
|
@ -104,7 +105,14 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId)
|
||||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n")
|
this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n")
|
||||||
this.itemIcon.sprite = SetIcon(goodsId)
|
this.itemIcon.sprite = SetIcon(goodsId)
|
||||||
|
if itemConfig[this.shopItemInfo.Goods[1][1]].ItemType == 2 then
|
||||||
|
this.itemBg.sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[this.shopItemInfo.Goods[1][1]].Quantity))
|
||||||
|
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(true)
|
||||||
|
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemConfig[this.shopItemInfo.Goods[1][1]].PropertyName))
|
||||||
|
else
|
||||||
this.itemBg.sprite = SetFrame(goodsId)
|
this.itemBg.sprite = SetFrame(goodsId)
|
||||||
|
Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(false)
|
||||||
|
end
|
||||||
this.itemNum.text = this.goods[1][2]
|
this.itemNum.text = this.goods[1][2]
|
||||||
-- 计算最大可购买的数量
|
-- 计算最大可购买的数量
|
||||||
local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId)
|
local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId)
|
||||||
|
|
Loading…
Reference in New Issue