Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
467a05b683
|
@ -61557,7 +61557,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.32941177, g: 0.11372549, b: 0.047058824, a: 1}
|
||||
m_Color: {r: 0.16862746, g: 0.16862746, b: 0.16862746, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -66,7 +66,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
@ -700,7 +700,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.000075656135}
|
||||
m_AnchoredPosition: {x: -2, y: -0.00005083497}
|
||||
m_SizeDelta: {x: 666.65, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &1304049099460694528
|
||||
|
|
|
@ -409,10 +409,10 @@ MonoBehaviour:
|
|||
m_Padding:
|
||||
m_Left: -45
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Top: 80
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 160
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 130
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
|
|
@ -774,7 +774,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -119, y: -98}
|
||||
m_AnchoredPosition: {x: -106, y: -43}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &314648388604415527
|
||||
|
|
|
@ -135,6 +135,7 @@ function this.SingleItemDataShow2(go, data,curShopDataId)
|
|||
Util.GetGameObject(go, "zhe"):SetActive(storeConfig.IsDiscount > 0)
|
||||
Util.GetGameObject(go, "zhe"):GetComponent("Image").sprite = this.spLoader:LoadSprite("s_shop_zhekou_0"..storeConfig.DiscountDegree.."_zh")
|
||||
--LogError("ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID "..ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID)
|
||||
Util.SetGray(Util.GetGameObject(go, "price"),storeConfig.Limit - data.buyNum <= 0)
|
||||
Util.GetGameObject(go, "price/costIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID))
|
||||
Util.GetGameObject(go, "price/Text"):GetComponent("Text").text = num
|
||||
local buyBtn = Util.GetGameObject(go,"price/btnBuy")
|
||||
|
|
|
@ -219,7 +219,7 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
|
|||
end
|
||||
end
|
||||
end
|
||||
self.equipProGridCom.spacing = 150
|
||||
self.equipProGridCom.spacing = 130
|
||||
if self.jumpViewList and #self.jumpViewList then
|
||||
self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList))
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue