dev_chengFeng
ZhangBiao 2020-08-14 23:34:23 +08:00
parent d97203bf0b
commit 2063690199
11 changed files with 277 additions and 12 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: c3b7873dd51eea046bf8076c40dd62bc
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- 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: []
outline: []
physicsShape: []
bones: []
spriteID: de8aa4d674998b54cae7776e3d513642
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 164ca81b30b156848bd07e3da7bdd7f3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- 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: []
outline: []
physicsShape: []
bones: []
spriteID: 5efcf0c5da1b7d544bb025b3557e700a
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 1024ce88af84edc48963e8f72ccbdf29
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- 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: []
outline: []
physicsShape: []
bones: []
spriteID: 02f6a33e1813d7441abd9c4ac22481a1
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -476,7 +476,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7588112608478394022
RectTransform:
m_ObjectHideFlags: 0
@ -5178,7 +5178,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: 0, y: -31.894989}
m_AnchoredPosition: {x: 0, y: -31.894958}
m_SizeDelta: {x: 1080, y: 63.789978}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3702471273582254967

View File

@ -723,7 +723,7 @@ RedPointType = {
HeadChange_Frame = 23111,
HeadChange_Head = 23112,
--- 限时达人红点 ----
Expert_AdventureExper=3110,--秘境达人
Expert_FastExplore=3110,--秘境达人
Expert_AreaExper = 3111,--竞技达人
Expert_UpStarExper = 3109,--进阶达人
Expert_EquipExper = 3112,--装备达人
@ -987,7 +987,7 @@ ActivityTypeDef = {
DailyRecharge = 13,--每日首充
ContinuityRecharge = 14,--连续充值
LimitExchange = 15,--限时兑换活动
AdventureExper = 16,--秘境达人
FastExplore = 16,--极速达人
AreaExper = 17,--竞技达人
UpStarExper = 18,--进阶达人
EquipExper = 19,--装备达人
@ -1542,6 +1542,7 @@ ExperType = {
UpLv=23,--升级限量豪礼
ContinueRecharge=24,--积天豪礼
GiftBuy=25,--限时抢购
FastExplore=26,--极速达人
}
DynamicType = {--轮转活动类型

View File

@ -4,7 +4,7 @@ local expertRewardGrid = {}--七种达人 + 周卡 限时兑换
local expertRewardItemsGrid = {}
local expertRewardTabs = {}
local activeIndext = 0
local titleImageSprites = {[10]="r_daren_banner_002",[11]="r_daren_jingji",[9]="r_daren_banner_01",[12]="r_daren_zhuangbei",[13]="x_xianshihuodong_dianjindarenbanner",--"r_daren_dianjing",
local titleImageSprites = {[10]="x_xianshihuodong_jishudarenbanner",[11]="r_daren_jingji",[9]="r_daren_banner_01",[12]="r_daren_zhuangbei",[13]="x_xianshihuodong_dianjindarenbanner",--"r_daren_dianjing",
[14]="r_daren_fuben",[15]="r_daren_fuben",[16]="r_daren_fabao_01",[17]="r_daren_hunyin_01",[7]="r_huodong_leiji",
[19]="r_daren_xubao",[20]="r_daren_tanbao",[21]="r_daren_zhengmu",[22]="r_daren_mibao"}
function Expert:ctor(mainPanel, gameObject)

View File

@ -12,7 +12,7 @@ local imageSprite = {
[7] = {"r_huodong_leijichengzhianniu_01", "r_huodong_leijichengzhianniu"},
[8] = {"r_xianshiduihuan_anniu_01", "r_xianshiduihuan_anniu"},
[9] = {"r_daren_jinjieanniu_01", "r_daren_jinjieanniu"},
[10] = {"r_daren_tansuoanniu_01", "r_daren_tansuoanniu"},
[10] = {"x_xianshihuodong_jishudarenicon2", "x_xianshihuodong_jishudarenicon1"},
[11] = {"r_daren_jingjianniu_01", "r_daren_jingjianniu"},
[12] = {"r_daren_zhuangbeianniu_01", "r_daren_zhuangbeianniu"},
[13] = {"r_daren_dianjinanniu_01", "r_daren_dianjinanniu"},
@ -122,7 +122,7 @@ function ExpertPanel:BindEvent()
--BindRedPointObject(RedPointType.Expert_LuckyTurn, expertRedPointGrid[6])
BindRedPointObject(RedPointType.Expert_AccumulativeRecharge, expertRedPointGrid[7])
BindRedPointObject(RedPointType.Expert_UpStarExper, expertRedPointGrid[9])
BindRedPointObject(RedPointType.Expert_AdventureExper, expertRedPointGrid[10])
BindRedPointObject(RedPointType.Expert_FastExplore, expertRedPointGrid[10])
BindRedPointObject(RedPointType.Expert_AreaExper, expertRedPointGrid[11])
BindRedPointObject(RedPointType.Expert_EquipExper, expertRedPointGrid[12])
BindRedPointObject(RedPointType.Expert_GoldExper, expertRedPointGrid[13])
@ -349,7 +349,7 @@ function ExpertPanel:SetSelectBtn(index)
self.selectBtn:GetComponent("Image"):SetNativeSize()
end
function ExpertPanel:RefreshActivityBtn(context)
if context.type == ActivityTypeDef.AdventureExper then
if context.type == ActivityTypeDef.FastExplore then
tabBtns[10]:SetActive(context.status == 1)
elseif context.type == ActivityTypeDef.AreaExper then
tabBtns[11]:SetActive(context.status == 1)
@ -406,7 +406,7 @@ function ExpertPanel:RefreshActivityShow()
tabBtns[6]:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One))--探宝长久关闭
tabBtns[7]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper))
tabBtns[9]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpStarExper))
tabBtns[10]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AdventureExper))
tabBtns[10]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FastExplore))
tabBtns[11]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AreaExper))
tabBtns[12]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EquipExper))
tabBtns[13]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GoldExper))
@ -449,7 +449,7 @@ function ExpertPanel:OnDestroy()
--ClearRedPointObject(RedPointType.Expert_LuckyTurn)
ClearRedPointObject(RedPointType.Expert_AccumulativeRecharge)
ClearRedPointObject(RedPointType.Expert_UpStarExper)
ClearRedPointObject(RedPointType.Expert_AdventureExper)
ClearRedPointObject(RedPointType.Expert_FastExplore)
ClearRedPointObject(RedPointType.Expert_AreaExper)
ClearRedPointObject(RedPointType.Expert_EquipExper)
ClearRedPointObject(RedPointType.Expert_GoldExper)

View File

@ -190,7 +190,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.HeadChange_Head, RedPointType.Setting_Head)
--限时活动(达人)
RPData:SetParent(RedPointType.Expert_AdventureExper, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_FastExplore, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_AreaExper, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_UpStarExper, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_EquipExper, RedPointType.Expert)
@ -323,7 +323,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.HeadChange_Frame, HeadManager.CheckHeadRedPot)
RPData:AddCheckFunc(RedPointType.HeadChange_Head, HeadManager.CheckHeadRedPot)
--限时活动
RPData:AddCheckFunc(RedPointType.Expert_AdventureExper, ActivityGiftManager.ExpterActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_FastExplore, ActivityGiftManager.ExpterActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_AreaExper, ActivityGiftManager.ExpterActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_UpStarExper, ActivityGiftManager.ExpterActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_EquipExper,ActivityGiftManager.ExpterActivityIsShowRedPoint)