巅峰赛问题修改

dev_chengFeng
zhangqiang 2020-07-23 20:39:21 +08:00
parent 94684153c3
commit 6a855cf7a2
9 changed files with 56183 additions and 55396 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d71ce4123d1d0664696febe96f979dee
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: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5afeb7748d97f0b4cbc55115bcb1f0d7
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PublicAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -68,6 +68,7 @@ end
--界面打开时调用(用于子类重写)
function ArenaTypePanel:OnOpen(...)
-- SoundManager.PlayMusic(SoundConfig.BGM_Arena)
FormationManager.GetFormationByID(FormationTypeDef.ARENA_TOM_MATCH)
end
-- 打开,重新打开时回调

View File

@ -242,7 +242,7 @@ function this.RequestBetBaseInfo(func,isPlayBattle)
if this.baseInfo.battleStage == TOP_MATCH_STAGE.CHOOSE
and this.baseInfo.battleTurn == 1
and this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_READY then
this.isCanBet = false
-- this.isCanBet = false
if func then func() end
return
end
@ -364,7 +364,7 @@ end
function this.OnGuessSuccess(msg)
LogGreen("竞猜成功回调")
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
if MapManager.isInMap and UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.ArenaTopMatchPanel) then return end--在关卡里 副本里不弹 新加巅峰赛界面不弹
if MapManager.isInMap or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.ArenaTopMatchPanel) then return end--在关卡里 副本里不弹 新加巅峰赛界面不弹
UIManager.OpenPanel(UIName.GuessCoinDropPopup, msg.roundTimes, msg.itemId, msg.itemNum)
end

View File

@ -100,8 +100,8 @@ function ATM_EliminationView:OnOpen(...)
this.empty:SetActive(not _IsShowData)
this.middle:SetActive(_IsShowData)
GroupIndex=1
if battleState==1 then return end
LogRed("battleState "..battleState)
-- if battleState==1 then return end
if this.tabCtrl then
this.tabCtrl:ChangeTab(1)
end

View File

@ -214,12 +214,12 @@ function this.RefreshBaseShow()
local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(2)
isCanGuessByBattleEndState = true
LogRed("isCanGuessByBattleEndState "..tostring(isCanGuessByBattleEndState))
if battleStage == TOP_MATCH_STAGE.ELIMINATION then
if battleStage == TOP_MATCH_STAGE.ELIMINATION then
if upWinNum ~= 0 or downWinNum ~= 0 then
isCanGuessByBattleEndState = false
LogRed("isCanGuessByBattleEndState "..tostring(isCanGuessByBattleEndState))
end
end
LogRed("isCanGuessByBattleEndState "..tostring(isCanGuessByBattleEndState))
end
end
if IsBeted or not isCanGuessByBattleEndState then
local isBetRed = myBetTarget == betBattleInfo.enemyInfo.uid
local isBetBlue = myBetTarget == betBattleInfo.myInfo.uid

View File

@ -271,7 +271,7 @@ function RoleView:DelayFunc(time, func)
end
local timer
timer = Timer.New(function ()
if func then func() end
if func then func() func = nil end
self:ClearDelayFunc(timer)
end, time)
timer:Start()
@ -793,8 +793,9 @@ function RoleView:OnSkillCast(skill)
-- 立绘位置剧中
if self.rlgTween3 then self.rlgTween3:Kill() end
self.rlgTween3 = self.RoleLiveGO.transform:DOLocalMove(Vector3.New(self.outOffset[1], self.outOffset[2] - 220, 0), 0.3, false):SetEase(Ease.OutSine)
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask2").transform)
if self.liveRender.transform then
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask2").transform)
end
local cardRenderMat = self.liveRender.material
cardRenderMat:SetInt("_IsMask", 0)
@ -919,7 +920,7 @@ function RoleView:PlaySkillCastingEffect(combat, func)
else
self.RootPanel.enemySkillCast:SetActive(false)
end
if func then func() end
if func then func() func = nil end
end)
end