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

dev_chengFeng
altair 2020-07-30 14:43:01 +08:00
commit 153c2b986b
16 changed files with 53 additions and 51 deletions

View File

@ -175,7 +175,7 @@ Camera:
m_GameObject: {fileID: 142634917201502209}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -191,8 +191,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -201,11 +201,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: 5de79b6288f84a444b8a12f0a79ab667, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634917248643706
@ -253,7 +253,7 @@ Camera:
m_GameObject: {fileID: 142634917248643706}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -269,8 +269,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -279,11 +279,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: 43b50e92c5367114ab6e3f24305dfe8a, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634917263677721
@ -559,7 +559,7 @@ Camera:
m_GameObject: {fileID: 142634918030801159}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -575,8 +575,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -585,11 +585,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: fa6e38f151976b146985482d86c9f48f, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634918074715711
@ -735,7 +735,7 @@ Camera:
m_GameObject: {fileID: 142634918215416215}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -751,8 +751,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -761,11 +761,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: af10186367c1690418d1010bae399c18, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634918258021490
@ -877,7 +877,7 @@ Camera:
m_GameObject: {fileID: 142634918331807042}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -893,8 +893,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -903,11 +903,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: a0777c569f0d89a4e99961d7199eee84, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634918528523880
@ -1085,7 +1085,7 @@ Camera:
m_GameObject: {fileID: 142634918601937223}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
@ -1101,8 +1101,8 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
orthographic: 1
orthographic size: 77
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@ -1111,11 +1111,11 @@ Camera:
m_TargetTexture: {fileID: 8400000, guid: 1bcf789a5e9f1184db63456cae74cdc1, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &142634918746250721

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -15,7 +15,7 @@ RenderTexture:
m_Width: 640
m_Height: 960
m_AntiAliasing: 1
m_DepthFormat: 2
m_DepthFormat: 0
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1

View File

@ -1985,7 +1985,7 @@ local passivityList = {
local i1 = args[1]
-- 释放技能后
local onRoleHit = function(target)
LogError("target "..target.roleId .. " ".. target.star)
-- LogError("target "..target.roleId .. " ".. target.star)
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
for i = 1, i1 do
role:AddSkill(BattleSkillType.Normal, false, true, nil)

View File

@ -37,7 +37,7 @@ function RoleLogic:Init(uid, data, position)
self.element = data.element
self.professionId = data.professionId
self.star = data.star or 1
LogError("英雄uid".. self.roleId .." " .. self.star)
-- LogError("英雄uid".. self.roleId .." " .. self.star)
self.shield:Clear() --护盾列表
self.exCalDmgList:Clear() --额外计算伤害列表
self.buffFilter:Clear() --buff屏蔽列表

View File

@ -116,7 +116,7 @@ function this:FormationAdapter(msg)
local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId)
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star))
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality, curData.hero.star))
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName
SetHeroStars(starGrid, curData.hero.star)
proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))

View File

@ -216,6 +216,7 @@ function this.CheckHeroIdExist(heroId)
end
function this.UserPowerChanged()
local maxPower, targetTeamId = 0
for _, teamInfo in pairs(this.formationList) do
if #teamInfo.teamHeroInfos > 0 then
@ -227,7 +228,7 @@ function this.UserPowerChanged()
end
if maxPower > PlayerManager.maxForce then
Log(Language[10684])
NetManager.RequestUserForceChange(targetTeamId)
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId
PlayerManager.maxForce = maxPower
end
end

View File

@ -40,7 +40,7 @@ function GuildCarDelayFindBossPopup:OnShow()
local monsterGroupConfig = ConfigManager.GetConfigData(ConfigName.MonsterGroup,ConfigManager.GetConfigData(ConfigName.WorldBossConfig,curMonsterId).MonsterId)
if monsterGroupConfig then
for i = 1, #heroListGo do
if monsterGroupConfig.Contents[1][i] then
if monsterGroupConfig.Contents[1][i] and monsterGroupConfig.Contents[1][i] ~= 0 then
this.SetCardSingleData(heroListGo[i],monsterGroupConfig.Contents[1][i],i)
heroListGo[i]:SetActive(true)
else

View File

@ -114,10 +114,10 @@ function GuildCarDelayMainPanel:BindEvent()
Util.AddClick(this.HelpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.GuildCarDelay,this.helpPosition.x,this.helpPosition.y)
end)
--boss详情
Util.AddClick(this.live2dRoot, function()
UIManager.OpenPanel(UIName.GuildCarDelayFindBossPopup)
end)
-- --boss详情
-- Util.AddClick(this.live2dRoot, function()
-- UIManager.OpenPanel(UIName.GuildCarDelayFindBossPopup)
-- end)
end
--添加事件监听(用于子类重写)
@ -412,6 +412,7 @@ end
function this.RefrePanelRedPoint()
Util.GetGameObject(this.challengeBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge))
Util.GetGameObject(this.lootBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot))
--CheckRedPointStatus(RedPointType.LegendExplore)
Util.SetGray(Util.GetGameObject(this.challengeBtn,"redPoint"),false)
Util.SetGray(Util.GetGameObject(this.lootBtn,"redPoint"),false)
end

Binary file not shown.