Merge branch 'china/dev' into china/local

dev_chengFeng
JieLing 2021-04-28 19:11:42 +08:00
commit 3b136941e4
8 changed files with 32 additions and 14 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 262 KiB

View File

@ -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)
this.selectIndex.dataType = dataType
this.selectIndex.goodsId = 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()

View File

@ -33,7 +33,7 @@ local monsterArea = {
y_pos = {min = 8, max = 16},
},
[5003] = {
x_pos = {min = 9, max = 27},
x_pos = {min = 8, max = 28},
y_pos = {min = 8, max = 14},
},
[5004] = {

View File

@ -483,9 +483,11 @@ function this.ShowStory(nextId,OnFocus)
if isShowStory == 1 then
LogGreen("this.gameObject:"..this.gameObject.name)
this.gameObject:SetActive(false)
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,function()
this.GameSetActive(nextId,OnFocus)
end)
local function onCloseStoryMapPanel()
this.GameSetActive(nextId, OnFocus)
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,onCloseStoryMapPanel)
end
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,onCloseStoryMapPanel)
PlayerPrefs.SetInt("StoryMapPanel1"..PlayerManager.uid,0)
StoryMapManager.InitData(1)
else
@ -500,9 +502,8 @@ function this.ShowStory(nextId,OnFocus)
end
end
function this.GameSetActive(nextId,OnFocus)
function this.GameSetActive(nextId, OnFocus)
this.gameObject:SetActive(true)
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.GameSetActive)
this.NextGuide(nextId)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus)

View File

@ -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

View File

@ -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