Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu

TCX_LongZhu
PC-202302260912\Administrator 2024-11-04 20:32:36 +08:00
commit 68df82a750
3 changed files with 26 additions and 10 deletions

View File

@ -114,7 +114,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -244}
m_SizeDelta: {x: -615, y: -896}
m_SizeDelta: {x: -400, y: -896}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1776031365
CanvasRenderer:

View File

@ -2231,18 +2231,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1710925533096016}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
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_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224223836060665342}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1080, y: 604.5}
m_SizeDelta: {x: 0, y: -852}
m_Pivot: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 72}
m_SizeDelta: {x: 0, y: 213}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222189304179783542
CanvasRenderer:
m_ObjectHideFlags: 0

View File

@ -186,8 +186,8 @@ function ShopViewNew:ShowShop()
self:RefreshShopInfo(false, true)
-- 设置tip显隐
local isSSSHop = self.ShopType == SHOP_TYPE.SOUL_STONE_SHOP
self.scrollBg1:SetActive(false)
self.scrollBg2:SetActive(false)
--self.scrollBg1:SetActive(false)
--self.scrollBg2:SetActive(false)
self.titleBg:SetActive(not isSSSHop)
self.bottom:SetActive(not isSSSHop)
self.scrollBg3:SetActive(isSSSHop)
@ -559,6 +559,7 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData)
end
-- 商品颜色显示
--[[
local imgColor = isEmpty and Color.New(0.5, 0.5, 0.5, 1) or Color.New(1, 1, 1, 1)
local textA = isEmpty and 0.7 or 1
Util.SetColor(bg, imgColor)
@ -566,6 +567,21 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData)
self:SetAlpha(limitTip, textA)
self:SetAlpha(limitTimes, textA)
self:SetAlpha(itemPrice, textA)
]]
local imgColor = isEmpty and Color.New(0.5, 0.5, 0.5, 1) or Color.New(1, 1, 1, 1)
local textA = isEmpty and 0.7 or 1
Util.SetColor(bg, imgColor)
local bgImage = Util.GetGameObject(bg, "Image")
imgColor = isEmpty and Color.New(0.5, 0.5, 0.5, 1) or Color.New(0.54, 0.38, 0.81, 1)
local pricebg = Util.GetGameObject(bg, "pricebg"):GetComponent("Image")
pricebg.color =isEmpty and Color.New(0.1, 0.1, 0.1, 1) or Color.New(0.15, 0.15, 0.15, 1)
Util.SetColor(bgImage, imgColor)
self:SetAlpha(itemName, textA)
--SetAlpha(limitTip, textA)
self:SetAlpha(itemPrice, textA)
local isshow = false
if self.ShopType == ShopManager.selectIndex2.shopType then