Merge branch 'china/dev-c' into china/dev
commit
fb29ac6187
|
@ -10,10 +10,16 @@ this.curLevel = 0--社稷大典的等级
|
|||
this.curActivityType = 0
|
||||
this.OpenUIList = {}
|
||||
this.selectIndex = {dataType = 0,goodsId = {}}
|
||||
this.selectIndex2 = {dataType = 0,goodsId = {}}
|
||||
|
||||
function this.SetSelectIndex(dataType,goodsId)
|
||||
function this.SetSelectIndex(dataType,goodsId,b)
|
||||
this.selectIndex.dataType = dataType
|
||||
this.selectIndex.goodsId = goodsId
|
||||
if b and b == 1 then
|
||||
else
|
||||
this.selectIndex2.dataType = dataType
|
||||
this.selectIndex2.goodsId = goodsId
|
||||
end
|
||||
end
|
||||
|
||||
function this.Initialize()
|
||||
|
|
|
@ -164,7 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
|
|||
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
|
||||
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
||||
if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then
|
||||
DynamicActivityManager.SetSelectIndex(0,{})
|
||||
DynamicActivityManager.SetSelectIndex(0,{},1)
|
||||
curindex = i
|
||||
break
|
||||
end
|
||||
|
|
|
@ -131,7 +131,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId)
|
|||
self.parent:RefreshData(nil,false,false)
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
if shopType==20 and itemId==1107 then
|
||||
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1112 )then
|
||||
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
|
||||
end
|
||||
end)
|
||||
|
@ -222,9 +222,9 @@ end
|
|||
|
||||
function GiftPre:Effect()
|
||||
local isshow = false
|
||||
if self.data.DataType == DynamicActivityManager.selectIndex.dataType then
|
||||
for i = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
||||
if (self.data.data.shopData.id or self.data.data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[i] then
|
||||
if self.data.DataType == DynamicActivityManager.selectIndex2.dataType then
|
||||
for i = 1 , #DynamicActivityManager.selectIndex2.goodsId do
|
||||
if (self.data.data.shopData.id or self.data.data.shopData.goodsId) == DynamicActivityManager.selectIndex2.goodsId[i] then
|
||||
isshow = true
|
||||
break
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue