Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-23 17:42:46 +08:00
commit 259daf6a92
20 changed files with 567 additions and 20 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 5ccc5eca69132144b8aa6f0757b7e30a
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: dd063c329c8336148bb68fd57b925e53
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CarbonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 91f9f6ee7a698e649acd66ff36ce699e
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: 985bf7c69c260f348ad080857b333716
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CarbonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 877a6a869afbe3c44af0dfd0520ade7a
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: d042104e230d7344682c2c6df260b873
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CarbonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 796 KiB

View File

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

View File

@ -4171,6 +4171,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_senluohuanjing
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_shilianfuben
extension: .png
resPathIndex: 13
@ -4179,6 +4183,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_wanxiangjing
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_wujinfuben
extension: .png
resPathIndex: 13
@ -4187,6 +4195,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_xuanyuanbaojing
extension: .png
resPathIndex: 13
resAbNameIndex: 5
- resName: r_Dungeon_xuanze_jiandan
extension: .png
resPathIndex: 13
@ -16651,6 +16663,10 @@ MonoBehaviour:
extension: .jpg
resPathIndex: 117
resAbNameIndex: 1088
- resName: m_chsm_0035
extension: .png
resPathIndex: 117
resAbNameIndex: 1088
- resName: m_syjm_0026_png
extension: .png
resPathIndex: 117
@ -35515,10 +35531,6 @@ MonoBehaviour:
extension: .txt
resPathIndex: 355
resAbNameIndex: 1755
- resName: m_chsm_0035
extension: .png
resPathIndex: 355
resAbNameIndex: 1755
- resName: m_chsm_0035.skel
extension: .bytes
resPathIndex: 355
@ -35531,6 +35543,10 @@ MonoBehaviour:
extension: .mat
resPathIndex: 355
resAbNameIndex: 1755
- resName: m_chsm_0035_png
extension: .png
resPathIndex: 355
resAbNameIndex: 1755
- resName: m_chsm_0035_SkeletonData
extension: .asset
resPathIndex: 355

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 90460778e185bda4ca37b1b26a085530
guid: 58eb956e62475be41b19de1e6e714b13
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 KiB

View File

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

View File

@ -156,6 +156,7 @@ ConfigName = {
ArenaBattleReward = "ArenaBattleReward",
RaceTowerConfig = "RaceTowerConfig",
RaceTowerRewardConfig = "RaceTowerRewardConfig",
HeroSacrifice = "HeroSacrifice",
}
require "Framework/GameDataBase"

View File

@ -26,7 +26,7 @@ function Shield:OnStart()
self.target.buffFilter:Add(immune0)
-- 清除所有负面buff
BattleLogic.BuffMgr:ClearBuff(self.target, function (buff)
return buff.type == BuffName.Control or buff.type == BuffName.Dot
return buff.type == BuffName.Control or buff.type == BuffName.DOT
end)
end
end

View File

@ -20,7 +20,7 @@ local type = {
liveSize = Vector2(1024, 1145)
},
[2] = {
id = 1011, --心魔
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
bg = "r_Dungeon_rendi_02",
name = "r_Dungeon_xinmoshilian",
live = "shixueguimo",
@ -52,7 +52,7 @@ local type = {
namePos = Vector2(-323.01, 0),
nameSize = Vector2(257, 268),
[1] = {
id = 30, --森罗
id = FUNCTION_OPEN_TYPE.TRIAL, --森罗
bg = "r_Dungeon_rendi_03",
name = "r_Dungeon_senluohuanjing",
live = "m_chsm_0035",
@ -231,8 +231,6 @@ function this.UpdateCarbonContent()
end
if data.id == -1 then
Util.SetGray(v,true)
elseif data.id == 1011 then
Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(30))
else
Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(data.id))
end
@ -241,15 +239,15 @@ end
function this.BtnClick(id)
if id == FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN then
if ActTimeCtrlManager.SingleFuncState(67) == false then --如果未解锁
if ActTimeCtrlManager.SingleFuncState(id) == false then --如果未解锁
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN))
return
end
UIManager.OpenPanel(UIName.DailyCarbonPanel)
elseif id == 1011 then
elseif id == FUNCTION_OPEN_TYPE.MONSTER_COMING then
JumpManager.GoJump(1011)
elseif id == FUNCTION_OPEN_TYPE.EXPEDITION then
if ActTimeCtrlManager.SingleFuncState(JumpType.Expedition) then
if ActTimeCtrlManager.SingleFuncState(id) then
if #ExpeditionManager.nodeInfo <= 0 then
if ExpeditionManager.expeditionLeve == -1 then
NetManager.GetExpeditionRequest(
@ -282,8 +280,8 @@ function this.BtnClick(id)
return
end
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
elseif id == 30 then
if ActTimeCtrlManager.SingleFuncState(30) then
elseif id == FUNCTION_OPEN_TYPE.TRIAL then
if ActTimeCtrlManager.SingleFuncState(id) then
CarbonManager.difficulty = 2
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)

View File

@ -2164,18 +2164,18 @@ function this.GetHeroReturnItems(selectHeroData, type)
end
else
if v.breakId > 0 then
local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.breakId)
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",2,"Key",v.breakId)
if heroRankUpConfig then
local sumConsume = heroRankUpConfig.SumConsume
local sumConsume = heroRankUpConfig.Value
for i = 1, #sumConsume do
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
end
end
end
if v.upStarId > 0 then
local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.upStarId)
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.upStarId)
if heroRankUpConfig then
local sumConsume = heroRankUpConfig.SumConsume
local sumConsume = heroRankUpConfig.Value
for i = 1, #sumConsume do
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
end

View File

@ -653,7 +653,11 @@ function this:BindEvent()
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA)
end)
Util.AddClick(this.btnColorfulWorld, function()
UIManager.OpenPanel(UIName.CarbonTypePanelV2,2)
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,2)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
end
end)
Util.AddClick(this.btnFenjie, function()
JumpManager.GoJump(24001)