parent
9931a8bafb
commit
7f1147071a
|
@ -1089,7 +1089,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &740584857
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1107,10 +1107,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6635425252939893920}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 737.2, y: -58.95}
|
||||
m_SizeDelta: {x: 150, y: 73}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &740584860
|
||||
CanvasRenderer:
|
||||
|
@ -3224,7 +3224,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -5.7, y: -44.350006}
|
||||
m_AnchoredPosition: {x: -5.7, y: 0}
|
||||
m_SizeDelta: {x: 184.2, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1353469745083610978
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2f11459db7ec0544ba77ce176bf91f30
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -12,11 +12,11 @@ local isFirst=true
|
|||
local curBtn=nil
|
||||
local curConfig=nil
|
||||
local turnsInfo={
|
||||
[1]={name="GM商城",id=108, priId=2204,priName="天选GM"},
|
||||
[2]={name="白嫖商城",id=109,priId=2201,priName="白嫖GM"},
|
||||
[3]={name="超级商城",id=110,priId=2202,priName="刷充GM"},
|
||||
[4]={name="至尊商城",id=111,priId=2203,priName="至尊GM"},
|
||||
[5]={name="天选商城",id=112,priId=2204,priName="天选GM"},
|
||||
--[1]={name="GM商城",id=108, priId=2204,priName="天选GM"},
|
||||
[1]={name="白嫖商城",id=109,priId=2201,priName="白嫖GM"},
|
||||
[2]={name="超级商城",id=110,priId=2202,priName="刷充GM"},
|
||||
[3]={name="至尊商城",id=111,priId=2203,priName="至尊GM"},
|
||||
[4]={name="天选商城",id=112,priId=2204,priName="天选GM"},
|
||||
}
|
||||
local gmTipInfo={
|
||||
--[0]={name="白嫖商城",id=102,priId=2201,priName="刷充GM"},
|
||||
|
@ -56,7 +56,7 @@ function GMChangePanel:InitComponent()
|
|||
this.shopInfo=Util.GetGameObject(self.gameObject, "layout/shopInfo")
|
||||
this.btn_oneKey=Util.GetGameObject(self.gameObject, "layout/shopInfo/btn_oneKey")
|
||||
this.gmBtns={}
|
||||
for i = 1, 5 do
|
||||
for i = 1, 4 do
|
||||
this.gmBtns[i]={}
|
||||
this.gmBtns[i].btn=Util.GetGameObject(this.shopInfo, "Top/btn"..i)
|
||||
this.gmBtns[i].selectImg=Util.GetGameObject(this.shopInfo, "Top/btn"..i.."/SelectBG")
|
||||
|
@ -149,6 +149,7 @@ function this.ShopItemAdapter(shopItem, itemData)
|
|||
else
|
||||
itemDes.gameObject:SetActive(false)
|
||||
end
|
||||
--LogError("RelatedtoVIP====================="..itemInfo.RelatedtoVIP)
|
||||
--itemInfo.GoodsName
|
||||
-- 折扣
|
||||
if price == 0 then
|
||||
|
@ -179,13 +180,14 @@ function this.ShopItemAdapter(shopItem, itemData)
|
|||
itemName.gameObject:SetActive(_IsUnLock)
|
||||
-- -- 限购
|
||||
limitBg:SetActive(maxLimitCount ~= -1)
|
||||
if ShopType==108 then
|
||||
if itemInfo.RelatedtoVIP==1 then
|
||||
limitTip.text ="永久限购".." "..maxLimitCount.."次"
|
||||
else
|
||||
limitTip.text ="每日限购".." "..maxLimitCount.."次"
|
||||
end
|
||||
SetTextVerTial(limitTip,Vector3.New(12.65,-4.2,0),"MiddleLeft")
|
||||
-- 售空 限购次数为-1 表示不限购
|
||||
--LogError("curBuyCount=============="..curBuyCount.." maxLimitCount=="..maxLimitCount)
|
||||
local isEmpty = maxLimitCount ~= -1 and curBuyCount >= maxLimitCount
|
||||
if curBuyCount >= maxLimitCount then
|
||||
empty:SetActive(true)
|
||||
|
@ -261,7 +263,7 @@ function this.SetAlpha(text, a)
|
|||
end
|
||||
---重置默认
|
||||
function this.ClearDefault()
|
||||
for i = 1, 5 do
|
||||
for i = 1, 4 do
|
||||
this.gmBtns[i].selectImg:SetActive(false)
|
||||
this.gmBtns[i].nameTxt.color=Color.New(0.71,0.64,0.51,1)
|
||||
end
|
||||
|
@ -285,7 +287,7 @@ function GMChangePanel:BindEvent()
|
|||
Util.AddClick(this.btn_up, function()
|
||||
UIManager.OpenPanel(UIName.GMShuaChongTeQuan)
|
||||
end)
|
||||
for i = 1, 5 do
|
||||
for i = 1, 4 do
|
||||
Util.AddClick(this.gmBtns[i].btn, function()
|
||||
this.SwitchShop(i)
|
||||
end)
|
||||
|
|
|
@ -164,7 +164,11 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId,backFun)
|
|||
this.RefreshCostShow()
|
||||
|
||||
-- 商店购买界面提示显示设置
|
||||
this.vipTip:SetActive(this.shopItemInfo.RelatedtoVIP == 1)
|
||||
local gmGift=false
|
||||
if this.shopItemInfo.Id==10801 or this.shopItemInfo.Id==10802 or this.shopItemInfo.Id==10803 or this.shopItemInfo.Id==10804 then
|
||||
gmGift=true
|
||||
end
|
||||
this.vipTip:SetActive(this.shopItemInfo.RelatedtoVIP == 1 and gmGift==false)
|
||||
local abcd = this.shopItemInfo.Cost[2]-- 公式常数
|
||||
this.costTip:SetActive(this.shopItemInfo.PremiumType == 2 or abcd[1] > 0 or abcd[2] > 0 or abcd[3] > 0 )
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue