大圣提交

dev_chengFeng
jiaoyangna 2021-06-18 18:55:04 +08:00
parent 60b2cf1cf6
commit 45a1079d88
5 changed files with 152 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e5d62ef53f4e50b4c82c34fb24fff4bd
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
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: []
outline: []
physicsShape: []
bones: []
spriteID: 885496b284131a6418b5a20738534dc6
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -288,7 +288,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 61.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &170924767488423321
@ -15513,7 +15513,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -41.1, y: -31.5}
m_AnchoredPosition: {x: -25.84, y: -13.1}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.49999997, y: 0.5}
--- !u!222 &6689915886973298813

View File

@ -1134,6 +1134,7 @@ MonoBehaviour:
- Assets/ManagedResources/~Lua/Modules/UIComponent
- Assets/ManagedResources/~Lua/Modules/Update
- Assets/ManagedResources/~Lua/Modules/UpGradePackage
- Assets/ManagedResources/~Lua/Modules/UpStar
- Assets/ManagedResources/~Lua/Modules/Vip
- Assets/ManagedResources/~Lua/Modules/WarPowerChange
- Assets/ManagedResources/~Lua/Modules/WorkShop
@ -16722,6 +16723,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 22
resAbNameIndex: 11
- resName: d_dengfengzaoji_xiaozidi
extension: .png
resPathIndex: 23
resAbNameIndex: 12
- resName: jiantou
extension: .png
resPathIndex: 23
@ -57218,6 +57223,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 596
resAbNameIndex: 3851
- resName: UpStarPre
extension: .prefab
resPathIndex: 596
resAbNameIndex: 3851
- resName: NewItem
extension: .prefab
resPathIndex: 597
@ -80380,6 +80389,7 @@ MonoBehaviour:
- lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_huodongguizezi_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_kehuojianglizi_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/s_shenyitianjiang_shizhuangyulan_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/s_slbz_yilingqu_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_lingpaishangdian_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_linpaiicon1_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_tiaozhanjiangli_zh.unity3d
@ -80473,7 +80483,6 @@ MonoBehaviour:
- lz4/dynamicatlas/r_xianshiduihuan_zidiban.unity3d
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
- lz4/dynamicatlas/r_ymqf_tiao_3.unity3d
- lz4/dynamicatlas/s_shengxingyouli_banner_zh.unity3d
- lz4/dynamicatlas/s_shenyitianjiang_beijin.unity3d
- lz4/dynamicatlas/s_shenyitianjiang_kuang.unity3d
- lz4/dynamicatlas/s_shenyitianjiang_zi_zh.unity3d
@ -81855,6 +81864,7 @@ MonoBehaviour:
- lz4/publicartres/animations.unity3d
- assetBundleName: lz4/prefabs/ui/newactivity.unity3d
dependences:
- lz4/atlas/battleatlas.unity3d
- lz4/atlas/commonatlas.unity3d
- lz4/atlas/popupatlas.unity3d
- lz4/atlas/publicatlas.unity3d
@ -81878,12 +81888,14 @@ MonoBehaviour:
- lz4/dynamicatlas/commonatlas/l_mrlb_biankuang.unity3d
- lz4/dynamicatlas/commonatlas/l_mrlb_biaoqian.unity3d
- lz4/dynamicatlas/commonatlas/r_dungeon_menghei_03.unity3d
- lz4/dynamicatlas/commonatlas/r_hero_suodi_suo.unity3d
- lz4/dynamicatlas/commonatlas/r_jyxz_qizhi_di.unity3d
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_danjuyuan.unity3d
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiaanniu.unity3d
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiadaojukuang.unity3d
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d
- lz4/dynamicatlas/commonatlas/y_yueka_hongxian.unity3d
- lz4/dynamicatlas/g_gonghui_shijuezhen_anniudihei.unity3d
- lz4/dynamicatlas/l_libao_kuang.unity3d
- lz4/dynamicatlas/l_mrlb_tiao.unity3d
- lz4/dynamicatlas/l_mrlb_tiao_jpg.unity3d
@ -81898,6 +81910,9 @@ MonoBehaviour:
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
- lz4/dynamicatlas/r_ymqf_tiao_3.unity3d
- lz4/dynamicatlas/s_shouchong_anniu.unity3d
- lz4/dynamicatlas/s_slbz_kuang1.unity3d
- lz4/dynamicatlas/s_slbz_kuang2.unity3d
- lz4/dynamicatlas/s_slbz_xian.unity3d
- lz4/effectresui/meirilibao.unity3d
- lz4/effectresui/tiangongxunbao.unity3d
- lz4/fonts/artfont_1.unity3d

View File

@ -45,7 +45,8 @@ function CommonActPage:InitComponent()
--大圣升星
self.dasheng = Util.GetGameObject(self.gameObject, "Bg/dasheng")
self.time1 = Util.GetGameObject(self.dasheng, "time1/timeText")
self.timeDashengkuang = Util.GetGameObject(self.dasheng, "time1")
self.timeDasheng = Util.GetGameObject(self.timeDashengkuang, "timeText"):GetComponent("Text")
self.itemPreDasheng = Util.GetGameObject(self.dasheng, "ItemPre")
self.ItemList = {}
end
@ -103,6 +104,12 @@ function CommonActPage:OnShow(_sortingOrder)
else
self.titleIma.gameObject:SetActive(false)
end
if self.actConfig.Icon[5] and self.actConfig.Icon[5] ~= "" then
self.titleTipBg.gameObject:SetActive(true)
else
self.titleTipBg.gameObject:SetActive(false)
end
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|")
@ -191,16 +198,26 @@ function CommonActPage:ShowSingleData(item,sdata,index)
end
function CommonActPage:RefreshTime()
self.timeDashengkuang:SetActive(false)
self.time:SetActive(false)
if self.actConfig.ShowTime == 0 then
self.time:SetActive(false)
return
end
if self.localTimer then
self.localTimer:Stop()
self.localTimer = nil
end
self.time:SetActive(true)
local freshTime
local time ,timeText
if self.actType == ActivityTypeDef.ChaoFanRuSheng then
time = self.timeDashengkuang
timeText = self.timeDasheng
else
time = self.time
timeText = self.timeText
end
time:SetActive(true)
local freshTime
if self.actType == ActivityTypeDef.AccumulativeRechargeExper then
freshTime = CalculateSecondsNowTo_N_OClock(24)
else
@ -209,11 +226,11 @@ function CommonActPage:RefreshTime()
local update = function()
if self.actConfig.ShowTime == 1 then
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
timeText.text = Language[10023]..TimeToFelaxible(freshTime)
elseif self.actConfig.ShowTime == 2 then
self.timeText.text = Language[10023]..TimeToDHMS(freshTime)
timeText.text = Language[10023]..TimeToDHMS(freshTime)
elseif self.actConfig.ShowTime == 3 then
self.timeText.text = Language[10023]..TimeToHMS(freshTime)
timeText.text = Language[10023]..TimeToHMS(freshTime)
end
end
update()