【山河社稷图】特效提交
parent
4b54176492
commit
b92e659e53
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 318e5cd85ce7b02469fbad52dbaf807a
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e16fe61e95905454c8b3cf15df4daf56
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2a080c2754e7d04d88cb25748aae343
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b24c0927edec9bb4a930bf74f93acc3b
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 701fa933f1ea4544da6e4818c7c273ea
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,29 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: UI_fuzhou_06
|
||||||
|
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _InvFade: 1
|
||||||
|
m_Colors:
|
||||||
|
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d0e52c19b5e71ca4399fd93a58602ea8
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -0,0 +1,29 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: xl_024
|
||||||
|
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 2800000, guid: be7a31ed9da21fc49a0a9c216bf58507, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _InvFade: 3
|
||||||
|
m_Colors:
|
||||||
|
- _TintColor: {r: 1, g: 1, b: 1, a: 0.16862746}
|
|
@ -0,0 +1,9 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c175709e560ce140b7fa3268018befe
|
||||||
|
timeCreated: 1510298699
|
||||||
|
licenseType: Pro
|
||||||
|
NativeFormatImporter:
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: be7a31ed9da21fc49a0a9c216bf58507
|
||||||
|
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: c0ece09b5ced0bf42af8b14406808cc1
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -5,6 +5,7 @@ local sortingOrder = 0
|
||||||
local boxList = {}
|
local boxList = {}
|
||||||
local levelList = {}
|
local levelList = {}
|
||||||
local levelListEffect = {}
|
local levelListEffect = {}
|
||||||
|
local starListEffect = {}
|
||||||
local chapterId = 0
|
local chapterId = 0
|
||||||
local chapterData = {}
|
local chapterData = {}
|
||||||
local allMissionDailyBoxItemPres = {}
|
local allMissionDailyBoxItemPres = {}
|
||||||
|
@ -27,6 +28,7 @@ function FightLevelSingleChapterPanel:InitComponent()
|
||||||
this.rect = Util.GetGameObject(self.gameObject, "middle/rect")
|
this.rect = Util.GetGameObject(self.gameObject, "middle/rect")
|
||||||
levelList = {}
|
levelList = {}
|
||||||
levelListEffect = {}
|
levelListEffect = {}
|
||||||
|
starListEffect = {}
|
||||||
this.rewardBoxParent = Util.GetGameObject(self.gameObject, "middle/rewardBg/btnList")
|
this.rewardBoxParent = Util.GetGameObject(self.gameObject, "middle/rewardBg/btnList")
|
||||||
this.progressBottom = Util.GetGameObject(self.gameObject, "middle/rewardBg/progressBottom/Image"):GetComponent("Image")
|
this.progressBottom = Util.GetGameObject(self.gameObject, "middle/rewardBg/progressBottom/Image"):GetComponent("Image")
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
|
@ -68,6 +70,11 @@ function FightLevelSingleChapterPanel:BindEvent()
|
||||||
end
|
end
|
||||||
function FightLevelSingleChapterPanel:OnSortingOrderChange()
|
function FightLevelSingleChapterPanel:OnSortingOrderChange()
|
||||||
--特效层级重设
|
--特效层级重设
|
||||||
|
if starListEffect and #starListEffect > 0 then
|
||||||
|
for i=1,#starListEffect do
|
||||||
|
Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - sortingOrder)
|
||||||
|
end
|
||||||
|
end
|
||||||
if levelListEffect and #levelListEffect > 0 then
|
if levelListEffect and #levelListEffect > 0 then
|
||||||
for i=1,#levelListEffect do
|
for i=1,#levelListEffect do
|
||||||
Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder)
|
Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder)
|
||||||
|
@ -160,6 +167,9 @@ function this.SetSingleLevel(levelDatas)
|
||||||
go.transform.localPosition = Vector3.zero
|
go.transform.localPosition = Vector3.zero
|
||||||
levelList[i] = go
|
levelList[i] = go
|
||||||
levelListEffect[i] = Util.GetGameObject(go, "UI_Effect_Kuang_JinSe")
|
levelListEffect[i] = Util.GetGameObject(go, "UI_Effect_Kuang_JinSe")
|
||||||
|
for j = 1, 3 do
|
||||||
|
starListEffect[i] = Util.GetGameObject(go, "isFirst/Fx_star_looping (".. j ..")")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
go.gameObject:SetActive(false)
|
go.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
@ -171,12 +181,17 @@ function this.SetSingleLevel(levelDatas)
|
||||||
local prb2 = Util.GetGameObject(levelList[i], "prb2")--副奖励
|
local prb2 = Util.GetGameObject(levelList[i], "prb2")--副奖励
|
||||||
local prb3 = Util.GetGameObject(levelList[i], "prb3")--副战斗
|
local prb3 = Util.GetGameObject(levelList[i], "prb3")--副战斗
|
||||||
local UI_Effect_Kuang_JinSe = Util.GetGameObject(levelList[i], "UI_Effect_Kuang_JinSe")
|
local UI_Effect_Kuang_JinSe = Util.GetGameObject(levelList[i], "UI_Effect_Kuang_JinSe")
|
||||||
|
local isFarstEffect = Util.GetGameObject(levelList[i], "isFirst")
|
||||||
local isOpen = this.GetCurLevelIsOpen(levelDatas[i])-- -1 未开启 0 开启 1 需解锁上一关 2 等级不足
|
local isOpen = this.GetCurLevelIsOpen(levelDatas[i])-- -1 未开启 0 开启 1 需解锁上一关 2 等级不足
|
||||||
prb1:SetActive(false)
|
prb1:SetActive(false)
|
||||||
prb2:SetActive(false)
|
prb2:SetActive(false)
|
||||||
prb3:SetActive(false)
|
prb3:SetActive(false)
|
||||||
UI_Effect_Kuang_JinSe:SetActive(isOpen == 0 and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel)
|
UI_Effect_Kuang_JinSe:SetActive(isOpen == 0 and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel)
|
||||||
Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - sortingOrder)
|
isFarstEffect:SetActive(levelData.isFirst and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel)
|
||||||
|
for j = 1, 3 do
|
||||||
|
Util.AddParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1))
|
||||||
|
end
|
||||||
|
Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - (sortingOrder - 1))
|
||||||
if levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then --主关卡
|
if levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then --主关卡
|
||||||
prb1:SetActive(true)
|
prb1:SetActive(true)
|
||||||
Util.GetGameObject(prb1, "nameBg"):GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and LevleTitleBg[1] or LevleTitleBg[2])
|
Util.GetGameObject(prb1, "nameBg"):GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and LevleTitleBg[1] or LevleTitleBg[2])
|
||||||
|
|
|
@ -54,7 +54,6 @@ function FightLevelSingleLevelInfoPopup:AddListener()
|
||||||
contentScripts[i].view:AddListener()
|
contentScripts[i].view:AddListener()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function FightLevelSingleLevelInfoPopup:RemoveListener()
|
function FightLevelSingleLevelInfoPopup:RemoveListener()
|
||||||
for i = 1, #contentScripts do
|
for i = 1, #contentScripts do
|
||||||
|
@ -88,6 +87,11 @@ function FightLevelSingleLevelInfoPopup:OnShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function FightLevelSingleLevelInfoPopup:OnSortingOrderChange()
|
||||||
|
for i = 1, #contentScripts do
|
||||||
|
contentScripts[i].view:OnSortingOrderChange(self.sortingOrder)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function FightLevelSingleLevelInfoPopup:OnClose()
|
function FightLevelSingleLevelInfoPopup:OnClose()
|
||||||
|
|
|
@ -141,16 +141,16 @@ function this:FormationAdapter()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.OnSortingOrderChange()
|
function this:OnSortingOrderChange(_sortingOrder)
|
||||||
for i = 1, #heroListGo do
|
for i = 1, #heroListGo do
|
||||||
Util.AddParticleSortLayer(heroListGo[i], self.sortingOrder - sortingOrder)
|
Util.AddParticleSortLayer(heroListGo[i], _sortingOrder - sortingOrder)
|
||||||
end
|
end
|
||||||
for i, v in pairs(this.NoviceItemList) do
|
for i, v in pairs(this.NoviceItemList) do
|
||||||
if this.NoviceItemList[i] and this.NoviceItemList[i].gameObject then
|
if this.NoviceItemList[i] and this.NoviceItemList[i].gameObject then
|
||||||
this.NoviceItemList[i]:SetEffectLayer(sortingOrder)
|
this.NoviceItemList[i]:SetEffectLayer(sortingOrder)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
sortingOrder = self.sortingOrder
|
sortingOrder = _sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
--设置单个上阵英雄信息
|
--设置单个上阵英雄信息
|
||||||
|
|
|
@ -14,6 +14,7 @@ local conditionGo = {}
|
||||||
local HardStage = ConfigManager.GetConfig(ConfigName.HardStage)
|
local HardStage = ConfigManager.GetConfig(ConfigName.HardStage)
|
||||||
local HardStageCondition = ConfigManager.GetConfig(ConfigName.HardStageCondition)
|
local HardStageCondition = ConfigManager.GetConfig(ConfigName.HardStageCondition)
|
||||||
local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
|
local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
|
||||||
|
local starListEffect = {}
|
||||||
function this:InitComponent(gameObject)
|
function this:InitComponent(gameObject)
|
||||||
this.spLoader = SpriteLoader.New()
|
this.spLoader = SpriteLoader.New()
|
||||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||||
|
@ -25,14 +26,17 @@ function this:InitComponent(gameObject)
|
||||||
for i = 1, 6 do
|
for i = 1, 6 do
|
||||||
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i)
|
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i)
|
||||||
end
|
end
|
||||||
|
starListEffect = {}
|
||||||
conditionGo = {}
|
conditionGo = {}
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
conditionGo[i] = Util.GetGameObject(gameObject, "Root/item (" .. i ..")")
|
conditionGo[i] = Util.GetGameObject(gameObject, "Root/item (" .. i ..")")
|
||||||
|
starListEffect[i] = Util.GetGameObject(gameObject, "isFirst/Fx_star_looping (" .. i ..")")
|
||||||
end
|
end
|
||||||
this.Root = Util.GetGameObject(gameObject,"Root")
|
this.Root = Util.GetGameObject(gameObject,"Root")
|
||||||
this.backBtn=Util.GetGameObject(gameObject,"BackBtn")
|
this.backBtn=Util.GetGameObject(gameObject,"BackBtn")
|
||||||
this.BackBattleBtn=Util.GetGameObject(gameObject,"BackBattleBtn")
|
this.BackBattleBtn=Util.GetGameObject(gameObject,"BackBattleBtn")
|
||||||
this.rewardBtn=Util.GetGameObject(gameObject,"rewardBtn")
|
this.rewardBtn=Util.GetGameObject(gameObject,"rewardBtn")
|
||||||
|
this.isFirstEffect = Util.GetGameObject(gameObject,"isFirst")
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:BindEvent()
|
function this:BindEvent()
|
||||||
|
@ -64,6 +68,7 @@ end
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,...)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
|
LogYellow("sortingOrder "..sortingOrder)
|
||||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||||
local args = {...}
|
local args = {...}
|
||||||
fightLevelData = args[1]
|
fightLevelData = args[1]
|
||||||
|
@ -90,6 +95,13 @@ function this.MainLevelInfoRefresh()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function this:ShoeCondition()
|
function this:ShoeCondition()
|
||||||
|
this.isFirstEffect:SetActive(fightLevelData.isFirst)
|
||||||
|
if starListEffect and #starListEffect > 0 then
|
||||||
|
for i=1,#starListEffect do
|
||||||
|
Util.AddParticleSortLayer(starListEffect[i], sortingOrder)
|
||||||
|
end
|
||||||
|
LogYellow("sortingOrder "..sortingOrder)
|
||||||
|
end
|
||||||
for i = 1, math.max(#condition, #conditionGo) do
|
for i = 1, math.max(#condition, #conditionGo) do
|
||||||
local go = conditionGo[i]
|
local go = conditionGo[i]
|
||||||
if not go then
|
if not go then
|
||||||
|
@ -132,11 +144,18 @@ function this:FormationAdapter()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.OnSortingOrderChange()
|
function this:OnSortingOrderChange(_sortingOrder)
|
||||||
|
LogYellow("_sortingOrder ".._sortingOrder)
|
||||||
for i = 1, #heroListGo do
|
for i = 1, #heroListGo do
|
||||||
Util.AddParticleSortLayer(heroListGo[i], self.sortingOrder - sortingOrder)
|
Util.AddParticleSortLayer(heroListGo[i], _sortingOrder - sortingOrder)
|
||||||
|
end
|
||||||
|
if starListEffect and #starListEffect > 0 then
|
||||||
|
for i=1,#starListEffect do
|
||||||
|
Util.AddParticleSortLayer(starListEffect[i], _sortingOrder - sortingOrder)
|
||||||
|
end
|
||||||
|
sortingOrder = _sortingOrder
|
||||||
|
LogYellow("sortingOrder "..sortingOrder)
|
||||||
end
|
end
|
||||||
sortingOrder = self.sortingOrder
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--设置单个上阵英雄信息
|
--设置单个上阵英雄信息
|
||||||
|
|
|
@ -51,6 +51,8 @@ function this:OnShow(_parent,...)
|
||||||
this.SetInfo(root,data[i],i)
|
this.SetInfo(root,data[i],i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
function this:OnSortingOrderChange(_sortingOrder)
|
||||||
|
end
|
||||||
--设置头像
|
--设置头像
|
||||||
function this.SetInfo(root,data,index)
|
function this.SetInfo(root,data,index)
|
||||||
root:SetActive(true)
|
root:SetActive(true)
|
||||||
|
|
|
@ -103,15 +103,15 @@ function this.SingleDataShow(_go,_rewardData,_index)
|
||||||
okButton:SetActive(FightLevelManager.GetCurLevelStarState(fightLevelData.state,index))
|
okButton:SetActive(FightLevelManager.GetCurLevelStarState(fightLevelData.state,index))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function this.OnSortingOrderChange()
|
function this:OnSortingOrderChange(_sortingOrder)
|
||||||
for i, v in pairs(this.NoviceItemList) do
|
for i, v in pairs(this.NoviceItemList) do
|
||||||
for j = 1, #this.NoviceItemList[i] do
|
for j = 1, #this.NoviceItemList[i] do
|
||||||
if this.NoviceItemList[i][j] and this.NoviceItemList[i][j].gameObject then
|
if this.NoviceItemList[i][j] and this.NoviceItemList[i][j].gameObject then
|
||||||
this.NoviceItemList[i][j]:SetEffectLayer(sortingOrder)
|
this.NoviceItemList[i][j]:SetEffectLayer(_sortingOrder)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
sortingOrder = self.sortingOrder
|
sortingOrder = _sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnClose()
|
function this:OnClose()
|
||||||
|
|
|
@ -317,9 +317,9 @@ function this.ShowBattleResultByFightLevelType(drop)
|
||||||
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
||||||
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
||||||
LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst))
|
LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst))
|
||||||
if curBattlefightLevelData.isFirst then
|
-- if curBattlefightLevelData.isFirst then
|
||||||
PopupTipPanel.ShowTip("荣耀三星!")
|
-- PopupTipPanel.ShowTip("荣耀三星!")
|
||||||
end
|
-- end
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,HardStageFightResponseMsg.drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
UIManager.OpenPanel(UIName.RewardItemPopup,HardStageFightResponseMsg.drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
||||||
if not isBackBattle then
|
if not isBackBattle then
|
||||||
if _BattleBestPopup then
|
if _BattleBestPopup then
|
||||||
|
|
|
@ -12,7 +12,7 @@ local bagType=0 --1 正常背包 2 临时背包 3 公会车迟显示
|
||||||
-- 1 -- > 界面显示升级
|
-- 1 -- > 界面显示升级
|
||||||
-- 2 -- > 显示地图自由探索按钮
|
-- 2 -- > 显示地图自由探索按钮
|
||||||
local compShowType = 0
|
local compShowType = 0
|
||||||
local sortingOrderNum = 0
|
local sortingOrder = 0
|
||||||
local callList = Stack.New()
|
local callList = Stack.New()
|
||||||
local isPopGetSSR = false
|
local isPopGetSSR = false
|
||||||
local isOpenGeiSSRAvtivity = 0--五星成长礼拍脸
|
local isOpenGeiSSRAvtivity = 0--五星成长礼拍脸
|
||||||
|
@ -22,6 +22,7 @@ local itemDataList
|
||||||
local showHero = 1
|
local showHero = 1
|
||||||
local isBackBattle = false
|
local isBackBattle = false
|
||||||
local conditionGo = {}
|
local conditionGo = {}
|
||||||
|
local starListEffect = {}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
--此界面无奈做了两套显示逻辑一个是掉落小于等于25时背景根据元素数量做拉伸状态 另一个是元素大于25做界面做可滑动
|
--此界面无奈做了两套显示逻辑一个是掉落小于等于25时背景根据元素数量做拉伸状态 另一个是元素大于25做界面做可滑动
|
||||||
function RewardItemPopup:InitComponent()
|
function RewardItemPopup:InitComponent()
|
||||||
|
@ -82,10 +83,13 @@ function RewardItemPopup:InitComponent()
|
||||||
-- end
|
-- end
|
||||||
--山河社稷图副关卡
|
--山河社稷图副关卡
|
||||||
this.FightLevelAssistant=Util.GetGameObject(self.gameObject,"ScrollView/Content/Show/FightLevelAssistant")
|
this.FightLevelAssistant=Util.GetGameObject(self.gameObject,"ScrollView/Content/Show/FightLevelAssistant")
|
||||||
|
starListEffect = {}
|
||||||
this.Root=Util.GetGameObject(self.gameObject,"FightLevel3/Root")
|
this.Root=Util.GetGameObject(self.gameObject,"FightLevel3/Root")
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
conditionGo[i] = Util.GetGameObject(this.FightLevel3, "Root/item (" .. i ..")")
|
conditionGo[i] = Util.GetGameObject(this.FightLevel3, "Root/item (" .. i ..")")
|
||||||
|
starListEffect[i] = Util.GetGameObject(this.FightLevel3, "isFirst/Fx_star_looping (" .. i ..")")
|
||||||
end
|
end
|
||||||
|
this.isFirstEffect = Util.GetGameObject(this.FightLevel3,"isFirst")
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
@ -128,7 +132,6 @@ function RewardItemPopup:OnOpen(...)
|
||||||
isBackBattle = false
|
isBackBattle = false
|
||||||
isPlayerAniEnd = true
|
isPlayerAniEnd = true
|
||||||
isOpenGeiSSRAvtivity = 0
|
isOpenGeiSSRAvtivity = 0
|
||||||
sortingOrderNum = self.sortingOrder
|
|
||||||
local args = {...}
|
local args = {...}
|
||||||
local drop = args[1]
|
local drop = args[1]
|
||||||
bagType=args[2]
|
bagType=args[2]
|
||||||
|
@ -317,6 +320,15 @@ function this.FightLevelShow()
|
||||||
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
||||||
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
||||||
local condition = curBattlefightLevelData.config.ConditionValue
|
local condition = curBattlefightLevelData.config.ConditionValue
|
||||||
|
this.isFirstEffect:SetActive(curBattlefightLevelData.isFirst)
|
||||||
|
if starListEffect and #starListEffect > 0 then
|
||||||
|
for i=1,#starListEffect do
|
||||||
|
Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for j = 1, 3 do
|
||||||
|
Util.AddParticleSortLayer(Util.GetGameObject(this.isFirstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1))
|
||||||
|
end
|
||||||
for i = 1, math.max(#condition, #conditionGo) do
|
for i = 1, math.max(#condition, #conditionGo) do
|
||||||
local go = conditionGo[i]
|
local go = conditionGo[i]
|
||||||
if not go then
|
if not go then
|
||||||
|
@ -374,6 +386,12 @@ function RewardItemPopup:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if starListEffect and #starListEffect > 0 then
|
||||||
|
for i=1,#starListEffect do
|
||||||
|
Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - (sortingOrder - 1))
|
||||||
|
end
|
||||||
|
sortingOrder = self.sortingOrder
|
||||||
|
end
|
||||||
end
|
end
|
||||||
-- 根据物品列表数据显示物品
|
-- 根据物品列表数据显示物品
|
||||||
function RewardItemPopup:SetItemShow(drop)
|
function RewardItemPopup:SetItemShow(drop)
|
||||||
|
|
Loading…
Reference in New Issue