冲突提交
parent
6d79dcab9a
commit
68af385814
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5e52ff27f921f044a816fe47282215f9
|
||||
guid: 0588a537239acc347b569987c2422993
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -31,7 +31,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -75,12 +75,12 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: ea482b69c4959394eafa9aa91b095cf7
|
||||
spriteID: 2db28f2cee537ae4ab83da8bef3da965
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: be4f4fcaa29405448bc178f8b53c2665
|
||||
guid: 9a7452e68cec9d34d9c0555cdff0c572
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -31,7 +31,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -75,12 +75,12 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 4ffa00b78428f1247a7d9ee509134eb5
|
||||
spriteID: bb7cddff01e72bb44a37fd7f4b63ee4e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f83a7cf9f1b0e354eaa4d9bb286bad7a
|
||||
guid: d7707322ae9b89d4c82f5c4b9ef4ac9a
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -31,7 +31,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -75,12 +75,12 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2423899c86993b14f9cf9a3d07e9b470
|
||||
spriteID: 55b8c8a9e467d80489538297d37ecd45
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
|
@ -815,7 +815,10 @@ end
|
|||
function this.InitLeiJiChongZhiData(_type)
|
||||
local id = 0
|
||||
local type = _type
|
||||
<<<<<<< HEAD
|
||||
LogGreen("type")
|
||||
=======
|
||||
>>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交
|
||||
if type then
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(type)
|
||||
if (not id) or id == 0 then
|
||||
|
@ -824,18 +827,33 @@ function this.InitLeiJiChongZhiData(_type)
|
|||
else
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)
|
||||
if (not id) or id == 0 then
|
||||
<<<<<<< HEAD
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.type)
|
||||
if (not id) or id == 0 then
|
||||
return nil
|
||||
end
|
||||
else
|
||||
=======
|
||||
id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_recharge)
|
||||
if (not id) or id == 0 then
|
||||
return nil
|
||||
else
|
||||
type = ActivityTypeDef.DynamicAct_recharge
|
||||
end
|
||||
else
|
||||
type = ActivityTypeDef.AccumulativeRechargeExper
|
||||
>>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交
|
||||
local tempConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id)
|
||||
if tempConfig and tempConfig.ShowArt == 1 then
|
||||
return nil
|
||||
end
|
||||
end
|
||||
end
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
LogGreen("id:"..id)
|
||||
>>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交
|
||||
this.LeiJiChongZhiData = {}
|
||||
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id)
|
||||
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(type)
|
||||
|
|
Loading…
Reference in New Issue