【福星高照】bug修改
parent
3870a1cec6
commit
e615af9011
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
|||
|
|
@ -244,22 +244,22 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
|||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
elseif v.Type == 12 then--福星高照活动
|
||||
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao)
|
||||
local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
if ActData.value == 0 then
|
||||
time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
elseif ActData.value == 1 then
|
||||
time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp()
|
||||
elseif ActData.value == 2 then
|
||||
time = 0
|
||||
end
|
||||
if time >0 then
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
-- elseif v.Type == 12 then--福星高照活动
|
||||
-- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao)
|
||||
-- local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
-- local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
-- if ActData.value == 0 then
|
||||
-- time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
-- elseif ActData.value == 1 then
|
||||
-- time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp()
|
||||
-- elseif ActData.value == 2 then
|
||||
-- time = 0
|
||||
-- end
|
||||
-- if time >0 then
|
||||
-- if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
-- table.insert(patFaceAllData,v)
|
||||
-- end
|
||||
-- end
|
||||
else
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ function PatFacePanel:InitComponent()
|
|||
self.obg7 = Util.GetGameObject(self.transform, "frame/obg7")
|
||||
--限时神装礼包
|
||||
self.obg8 = Util.GetGameObject(self.transform, "frame/obg8")
|
||||
--福星高照活动
|
||||
self.obg9 = Util.GetGameObject(self.transform, "frame/obg9")
|
||||
-- --福星高照活动
|
||||
-- self.obg9 = Util.GetGameObject(self.transform, "frame/obg9")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -135,7 +135,7 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
patFaceSingleData.Type == FacePanelType.MainLevel or
|
||||
patFaceSingleData.Type == FacePanelType.Pokemon)
|
||||
self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin)
|
||||
self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
|
||||
-- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
|
||||
if patFaceSingleData.Type == FacePanelType.Sbtj then
|
||||
self:OnShowOb1Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.Tesc then
|
||||
|
|
@ -158,9 +158,9 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self:OnShowOb7Data(patFaceSingleData.Type)
|
||||
elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then
|
||||
self:OnShowOb8Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then
|
||||
LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao")
|
||||
self:OnShowOb9Data()
|
||||
-- elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then
|
||||
-- LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao")
|
||||
-- self:OnShowOb9Data()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -363,10 +363,10 @@ function PatFacePanel:OnShowOb8Data()
|
|||
end
|
||||
|
||||
--第九种 --福星高照活动
|
||||
function PatFacePanel:OnShowOb9Data()
|
||||
LogRed("function PatFacePanel:OnShowOb9Data()")
|
||||
UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end)
|
||||
end
|
||||
-- function PatFacePanel:OnShowOb9Data()
|
||||
-- LogRed("function PatFacePanel:OnShowOb9Data()")
|
||||
-- UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end)
|
||||
-- end
|
||||
|
||||
function PatFacePanel:JumpBtnClickEvent()
|
||||
if openPanle then
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
FuXingGaoZhaoManager = {}
|
||||
local this = FuXingGaoZhaoManager
|
||||
local Data = {}
|
||||
local timeData = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
|
||||
function this.Initialize()
|
||||
end
|
||||
|
|
@ -55,15 +56,22 @@ end
|
|||
|
||||
function this.CheckRedPoint()
|
||||
this.InitRewardData()
|
||||
if Data.ActState == 1 then
|
||||
if Data.ActState == 0 then
|
||||
local time = Data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp()
|
||||
local curDay = math.ceil(time/86400)
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay)
|
||||
if str == 0 then
|
||||
return true
|
||||
end
|
||||
elseif Data.ActState == 1 then
|
||||
for i = 1, #Data.rewards do
|
||||
if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then
|
||||
-- LogBlue("Return true")
|
||||
LogBlue("Return true")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
-- LogBlue("Return false")
|
||||
LogBlue("Return false")
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -66,10 +66,12 @@ end
|
|||
|
||||
--添加事件监听(用于子类重写)
|
||||
function FuXingGaoZhaoPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function FuXingGaoZhaoPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
function FuXingGaoZhaoPanel:OnSortingOrderChange()
|
||||
|
|
@ -110,6 +112,7 @@ end
|
|||
|
||||
function FuXingGaoZhaoPanel:Refresh()
|
||||
self.data = FuXingGaoZhaoManager.GetData()
|
||||
LogYellow("self.data.ActState:"..tostring(self.data.ActState))
|
||||
self:SetBtn()
|
||||
if self.data.ActState == 0 then
|
||||
self:SetTime()
|
||||
|
|
@ -144,6 +147,9 @@ function FuXingGaoZhaoPanel:SetTime()
|
|||
self.timer = nil
|
||||
end
|
||||
local time = self.data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp()
|
||||
local curDay = math.ceil(time/86400)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay,1)
|
||||
CheckRedPointStatus(RedPointType.FuXingGaoZhao)
|
||||
self.time.text = string.format(Language[12246],TimeToFelaxible(time))
|
||||
self.timer = Timer.New(function()
|
||||
time = time - 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue