Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
jiaoyangna 2021-01-14 10:18:28 +08:00
commit a382146703
25 changed files with 75 additions and 118 deletions

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 889 KiB

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -80,7 +80,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
spritePackingTag: DyAct_XinJiangLaiXi
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 888 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 1681975d4c916c941b2256fb1e903658
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 007356ba4723f224c94353621f3ca162
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 75567a6eea14ce04c9f2a803e52c8b23
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -16,7 +16,6 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
this.timer = Timer.New()
local challengeNum = 0
local lootNum = 0
local bossNum = 0
--初始化组件(用于子类重写)
function GuildCarDelayMainPanel:InitComponent()
this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
@ -54,12 +53,6 @@ function GuildCarDelayMainPanel:InitComponent()
this.RankListPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(50,8))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.WorldBossConfig)) do
if v.Id > 0 then
bossNum = bossNum + 1
end
end
end
--绑定事件(用于子类重写)
@ -186,9 +179,7 @@ end
function this.ShowTitleAllData()
curMonsterId = GuildCarDelayManager.bossIndexId
curMonsterIdConFig = ConfigManager.GetConfigData(ConfigName.WorldBossConfig,curMonsterId)
--获取上一个boss数据
local lastMonsterId,lastMonsterIdConFig = this.GetLastBoss(curMonsterId)
Log("curMonsterId:"..curMonsterIdConFig.Boss.." lastMonsterId:"..lastMonsterIdConFig.Boss)
Log("curMonsterId:"..curMonsterIdConFig.Boss)
this.name.text = heroConfig[curMonsterIdConFig.Boss].ReadingName
this.proImage.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[curMonsterIdConFig.Boss].PropertyName))
curProgress = GuildCarDelayManager.progress
@ -227,8 +218,7 @@ function this.ShowTitleAllData()
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.endTime - GetTimeStamp(),timeText)
end
if testLiveGO then
poolManager:UnLoadLive(GetResourcePath(heroConfig[lastMonsterIdConFig.Boss].Live), testLiveGO)
poolManager:UnLoadLive(GetResourcePath(heroConfig[curMonsterIdConFig.Boss].Live), testLiveGO)
GameObject.DestroyImmediate(testLiveGO)
end
local pos = heroConfig[curMonsterIdConFig.Boss].Position
testLiveGO = poolManager:LoadLive(GetResourcePath(heroConfig[curMonsterIdConFig.Boss].Live), this.live2dRoot.transform, Vector3.one*heroConfig[curMonsterIdConFig.Boss].Scale, Vector3.New(pos[1], pos[2], 0))
@ -241,17 +231,6 @@ function this.ShowTitleAllData()
this.RefrePanelRedPoint()
end
function this.GetLastBoss(curBossId)
local lastIndex = 0
if curBossId == 1 then
lastIndex = bossNum
else
lastIndex = curBossId - 1
end
local lastMonsterIdConFig = ConfigManager.GetConfigData(ConfigName.WorldBossConfig,lastIndex)
return lastMonsterIdConFig.Boss,lastMonsterIdConFig
end
-- tab节点显示自定义
function this.TabAdapter(tab, index, status)
local tabLab = Util.GetGameObject(tab, "Text")