Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-06-02 21:04:53 +08:00
commit 013a2b4951
9 changed files with 22353 additions and 22259 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 8d9c0742b222b5449a67df2db8c601fe
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2930b2f1df34c054d8d17e469cb84984
vertices: []
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 900 KiB

View File

@ -355,6 +355,7 @@ function this.FriendItemAdapter(node, data)
titlePar:SetActive(true)
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
titleList[node]:RemoveCanvas()
end
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else
@ -526,6 +527,7 @@ function this.ChatItemAdapter(node, data, isShowTime)
titlePar:SetActive(true)
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
titleList[node]:RemoveCanvas()
end
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else

View File

@ -102,7 +102,6 @@ end
-- 登录初始化地图数据
function this.InitMapInfoData(mapId)
-- --LogGreen("mapId:"..mapId)
this.openMapId = mapId > 1 and mapId or 4001-- 开放的地图ID
end
-- ================================== 妖灵师状态刷新 ========================================
@ -261,9 +260,7 @@ function this.InitAllEndlessHero(heroList,isClear)
this.InitSingleEndlessHero(heroList[i])
end
local id ,lv = this.GetShiQiValue()
-- --LogGreen("lv:"..lv)
this.moraleLv = lv
-- --LogGreen("this.moraleLv:"..this.moraleLv)
this.moraleId = id
end
@ -481,7 +478,7 @@ function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
end
function this.GetSingleCanUseHeroData(heroDid)
if not this.canUseHeroDatas then
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
this.GetCanUseHeroDatas()
end
if this.canUseHeroDatas[heroDid] then
@ -515,15 +512,12 @@ function this.GetCanUseHeroDatas()
end
function this.SetCanUseHeroNew()
LogGreen("111:")
if not this.canUseHeroDatas then
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
this.GetCanUseHeroDatas()
end
LogGreen("222:")
for k,v in pairs(this.canUseHeroDatas) do
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0)
v.isNew = 0
LogGreen("v.isNew:"..v.isNew)
end
CheckRedPointStatus(RedPointType.wujinBianDui)
CheckRedPointStatus(RedPointType.EndlessPanel)
@ -610,7 +604,6 @@ function this.GetHeroLeftBlood(heroId)
if this.allHeroBlood[heroId] then
return this.allHeroBlood[heroId].curHp
else
Log("神将血量值不存在,默认是满血")
local allProp = HeroManager.CalculateWarAllProVal(heroId)
return allProp[3]
end

View File

@ -36,7 +36,7 @@ function this:InitComponent()
this.rightUp = Util.GetGameObject(self.gameObject, "rightUp")
this.btnSetting = Util.GetGameObject(this.rightUp,"btnSetting")
this.btnSetting.gameObject:SetActive(true)
this.btnRightUpShop = Util.GetGameObject(this.rightUp,"btnShop")
this.btnRightUpShop = Util.GetGameObject(this.leftCenter,"btnShop")
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
this.helpPos = this.helpBtn:GetComponent("RectTransform").localPosition

View File

@ -318,12 +318,12 @@ end
function EndLessMapView:OnOpen()
LogError("EndLessMapView:OnOpen")
-- 初始化组件显示
this:InitCompShow(CarbonManager.difficulty)
if not this:IsEndLessMap() then return end
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
CheckRedPointStatus(RedPointType.EndlessPanel)
-- 初始化各种标志的状态
this:InitBoolState()
-- 开始探索请求
@ -335,8 +335,6 @@ function EndLessMapView:OnOpen()
this:InitCostValue()
this:RefreshEnergyValue(true, 0)
this:RefreshEnergyShow()
Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false)
this.helpBtn:SetActive(false)
-- 检测引导
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)

View File

@ -160,6 +160,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
self.userId = PlayerManager.uid
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil)
self.playerLiveView:RemoveTitleCanvas()
self.nameDi.gameObject:SetActive(false)
--如果修行开启设置修行标识
if ActTimeCtrlManager.SingleFuncState(108) then
@ -176,6 +177,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
ride = data.userMount,
designation = data.userTitle,
})
self.playerLiveView:RemoveTitleCanvas()
if data.userMount == 0 then
self.nameDi.transform.localPosition = namePos[1].pos
else