巅峰战bug and 使用按钮需求

zhangqiang 2020-08-24 21:46:19 +08:00
parent f6415aa772
commit abfde3e8a9
17 changed files with 53699 additions and 53635 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 822 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 6aa31f116bdd5754f8748c10196ac54c
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: 126938db845bccb44a41e9eca857ad61
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 941 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 5857b67ea1202f44ea9d3a888d40ac88
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: 74497f801f1bcfc418b2402cff17fa02
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 25b5dc7e3d1f3f0439c1c57a4ee96ace
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: 90a5ee8aff901204188eb3639f592ee8
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 58c347c39a1a13349bca7789a1a1dadc
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: fd5ba9700462a7c44a4ca11bb6987e56
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1977,4 +1977,10 @@ SoulPrintSpriteByQuantity={
[5] = { circle = "r_hunyin_hunyinkuanghuang001", circleBg1 = "r_hunyin_hunyinkuanghuang",circleBg2 = "r_hunyin_hunyinkuanghuang002"},
[6] = { circle = "r_hunyin_hunyinkuanghong001", circleBg1 = "r_hunyin_hunyinkuanghong",circleBg2 = "r_hunyin_hunyinkuanghong002"},
[7] = { circle = "r_hunyin_hunyinkuangzhuanshi001", circleBg1 = "r_hunyin_hunyinkuangzhuanshi",circleBg2 = "r_hunyin_hunyinkuangzhuanshi002"},
}
HeroPanelBgByPropertyName = {
[1] = "r_hero_bg_ren",--人
[2] = "r_hero_bg_fo",--佛
[3] = "r_hero_bg_yao",--妖
[4] = "r_hero_bg_dao",--道
}

View File

@ -126,8 +126,8 @@ function this.RefreshData(go, itemData)
state.color = config.color
-- 竞猜币
betNum.text = itemData.myBetCoins
getNum.text = itemData.myWinCoins
betNum.text = itemData.myBetCoins
getNum.text = (index == 1 or index == 0) and Language[12207] or itemData.myWinCoins
-- 头像
if not _PlayerHeadList[go] then

View File

@ -81,7 +81,7 @@ function this.RefreshData(go, data)
name.text = personInfo.name
force.text = personInfo.totalForce
local deltaIntegral = ArenaTopMatchManager.GetMatchDeltaIntegral()
score.text = personInfo.score * deltaIntegral > 0 and personInfo.score * deltaIntegral or Language[12207]
score.text = personInfo.score * deltaIntegral --> 0 and personInfo.score * deltaIntegral or Language[12207]
if not _PlayerHeadList[go] then
_PlayerHeadList[go] = SubUIManager.Open(SubUIConfig.PlayerHeadView, head.transform)

View File

@ -457,40 +457,44 @@ function this.RequestEliminationDataMerge(EliminationData)
local singledata = newEliminationDataV[1]
-- singledata.dataList = newEliminationDataV
local fightResult = -1 ---1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜
for i = 1, #newEliminationDataV do
if i == 1 and newEliminationDataV[i].fightResult == 0 then
fightResult = 3
elseif i == 1 and newEliminationDataV[i].fightResult == 1 then
fightResult = 2
elseif i == 1 and newEliminationDataV[i].fightResult == -1 then
LogPink("没考虑1 -1")
end
if i == 2 and newEliminationDataV[i].fightResult == 0 then
if fightResult == 3 then
fightResult = 0
elseif fightResult == 2 then
fightResult = 4
if #newEliminationDataV >= 2 then
for i = 1, #newEliminationDataV do
if i == 1 and newEliminationDataV[i].fightResult == 0 then
fightResult = 3
elseif i == 1 and newEliminationDataV[i].fightResult == 1 then
fightResult = 2
elseif i == 1 and newEliminationDataV[i].fightResult == -1 then
fightResult = -1
end
elseif i == 2 and newEliminationDataV[i].fightResult == 1 then
if fightResult == 3 then
fightResult = 5
elseif fightResult == 2 then
fightResult = 1
if i == 2 and newEliminationDataV[i].fightResult == 0 then
if fightResult == 3 then
fightResult = 0
elseif fightResult == 2 then
fightResult = 4
end
elseif i == 2 and newEliminationDataV[i].fightResult == 1 then
if fightResult == 3 then
fightResult = 5
elseif fightResult == 2 then
fightResult = 1
end
elseif i == 2 and newEliminationDataV[i].fightResult == -1 then
fightResult = -1
end
elseif i == 2 and newEliminationDataV[i].fightResult == -1 then
LogPink("没考虑2 -1")
end
if i == 3 then
if fightResult == 4 then
fightResult = newEliminationDataV[i].fightResult
elseif fightResult == 5 then
fightResult = newEliminationDataV[i].fightResult
if i == 3 then
if fightResult == 4 then
fightResult = newEliminationDataV[i].fightResult
elseif fightResult == 5 then
fightResult = newEliminationDataV[i].fightResult
end
elseif i == 3 and newEliminationDataV[i].fightResult == -1 then
if fightResult == 4 or fightResult == 5 then
fightResult = -1
end
end
if newEliminationDataV[i].isGUess <= 0 then
singledata.isGUess = newEliminationDataV[i].isGUess
end
elseif i == 3 and newEliminationDataV[i].fightResult == -1 then
LogPink("没考虑3 -1")
end
if newEliminationDataV[i].isGUess <= 0 then
singledata.isGUess = newEliminationDataV[i].isGUess
end
end
singledata.fightResult = fightResult

View File

@ -41,7 +41,7 @@ function this.InitComponent(root)
this.RightWinNum = {}
this.LeftWinNumGo = Util.GetGameObject(this.infoPanel, "Left/winNum")
this.RightWinNumGo = Util.GetGameObject(this.infoPanel, "Right/winNum")
for i = 1, 3 do
for i = 1, 2 do
this.LeftWinNum[i] = Util.GetGameObject(this.infoPanel, "Left/winNum/winNum (".. i ..")")
this.RightWinNum[i] = Util.GetGameObject(this.infoPanel, "Right/winNum/winNum (".. i ..")")
end
@ -222,28 +222,28 @@ function this.RefreshTwoOutOfThreeData()
if ArenaTopMatchManager.GetBaseData().battleStage == TOP_MATCH_STAGE.ELIMINATION then
local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(this.panelType)
for i = 1, 3 do
for i = 1, 2 do
if this.battleEndResultSortState then
if upWinNum >= i then
this.LeftWinNum[i]:SetActive(true)
Util.GetGameObject(this.LeftWinNum[i], "Image"):SetActive(true)
else
this.LeftWinNum[i]:SetActive(false)
Util.GetGameObject(this.LeftWinNum[i], "Image"):SetActive(false)
end
if downWinNum >= i then
this.RightWinNum[i]:SetActive(true)
Util.GetGameObject(this.RightWinNum[i], "Image"):SetActive(true)
else
this.RightWinNum[i]:SetActive(false)
Util.GetGameObject(this.RightWinNum[i], "Image"):SetActive(false)
end
else
if upWinNum >= i then
this.RightWinNum[i]:SetActive(true)
Util.GetGameObject(this.RightWinNum[i], "Image"):SetActive(true)
else
this.RightWinNum[i]:SetActive(false)
Util.GetGameObject(this.RightWinNum[i], "Image"):SetActive(false)
end
if downWinNum >= i then
this.LeftWinNum[i]:SetActive(true)
Util.GetGameObject(this.LeftWinNum[i], "Image"):SetActive(true)
else
this.LeftWinNum[i]:SetActive(false)
Util.GetGameObject(this.LeftWinNum[i], "Image"):SetActive(false)
end
end
end

View File

@ -110,9 +110,11 @@ function this.battleDetailBtnClick(isShowTip)
arg.red.name = betBattleInfo.enemyInfo.name
arg.red.head = betBattleInfo.enemyInfo.head
arg.red.frame = betBattleInfo.enemyInfo.headFrame
UIManager.OpenPanel(UIName.ArenaResultPopup, arg,function()
UIManager.OpenPanel(UIName.ArenaResultPopup, arg,
function()
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdateShowTip)
end)
end
)
end)
end
--添加事件监听(用于子类重写)

View File

@ -208,7 +208,7 @@ function this.SetItemData(...)
local info=Util.GetGameObject(root,"Info"):GetComponent("Image")
local name=Util.GetGameObject(root,"Name"):GetComponent("Text")
name.text=""
if args[2] then
if not this.playerHead[root] then
this.playerHead[root] = CommonPool.CreateNode(POOL_ITEM_TYPE.PLAYER_HEAD,head)

View File

@ -83,7 +83,7 @@ function RewardItemSingleShowPopup:BindEvent()
end)
Util.AddClick(this.btnJump, function()
if itemConfigData then
JumpManager.GoJump(itemConfigData.Jump)
JumpManager.GoJump(itemConfigData.UseJump)
end
end)
end
@ -203,7 +203,7 @@ function RewardItemSingleShowPopup:OnShow()
end
for i = 1, #jumpSortData do
if jumpSortData[i].id > 0 then
if(this.isRewardItemPop==true) then
if this.isRewardItemPop == true or itemConfigData.Id == 61 then--24暂时关闭
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false)
else
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true)