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

dev_chengFeng
ZhangBiao 2021-06-03 17:59:27 +08:00
commit 1d697c5370
19 changed files with 80 additions and 66 deletions

View File

@ -1,43 +0,0 @@
fileFormatVersion: 2
guid: 63221c66a32301e488f8630e8e904d63
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
1:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
4:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
7:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_axl01
assetBundleVariant: unity3d

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 67e55b9eecd549f4fb3ad929c42032c0
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

@ -4815,7 +4815,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 1
m_Bits: 33
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0

View File

@ -111,7 +111,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224577238906014488
RectTransform:
m_ObjectHideFlags: 0
@ -1395,7 +1395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &224533302136230720
RectTransform:
m_ObjectHideFlags: 0

View File

@ -91,7 +91,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8670530557904193430
RectTransform:
m_ObjectHideFlags: 0

View File

@ -1044,7 +1044,7 @@ JumpType = {
NPCPosType={
maincity=1,
onHook = 2,
}

View File

@ -653,6 +653,7 @@ end
-- 执行关卡战斗
function this.ExcuteBattle()
if not FightPointPassManager.IsChapterClossState() then
fightMap.StopAction()
UIManager.OpenPanel(UIName.FightMiddleChoosePanel, FightPointPassManager.curOpenFight, true,function ()
--- 临时代码
--FightPointPassManager.SetChapterOpenState(false)
@ -835,7 +836,7 @@ function this.RefreshLittleMap()
if this.liveNode then
this.liveNode:OnClose()
end
this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,1)
this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,orginLayer)
this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale3,Vector3.New(0,-40,0))
if FightPointPassManager.GetRoleDirection()==1 then
this.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT)

View File

@ -8,6 +8,7 @@ local AllActSetConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)
local censorshipConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig)
local gameSetConfig = ConfigManager.GetConfig(ConfigName.GameSetting)
local vipConfig = ConfigManager.GetConfig(ConfigName.VipLevelConfig)
local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig)
-- 整数的服务器时间
this.serTime = 0
@ -40,30 +41,52 @@ function this.Initialize()
--Log("关卡通关id = "..fightId)
this.CheckFuncActiveByType(1, fightId)
end)
end
-- 当功能解锁条件变化时检测
function this.CheckFuncActiveByType(activeType, params)
local ids = {}
for id, funcData in pairs(this.serData) do
local funcInfo = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig, id)
if funcInfo.OpenRules[1] == activeType then
local typeId = funcInfo.IsIDdSame
local isActive = this.SingleFuncState(typeId)
--Log("检测功能是否已解锁id = "..id..", isActive = "..tostring(isActive))
if not funcData.isActive and isActive then
local aGuideId = AllActSetConfig[typeId].GuideId
if AllActSetConfig[aGuideId] and AllActSetConfig[aGuideId].IsOpen and AllActSetConfig[aGuideId].IsOpen> 0 then
if ActivityGiftManager.IsActivityTypeOpen(ActivityGiftManager.GetActivityTypeFromId(GuideConfig[aGuideId].IsOpen)) then
table.insert(ids,typeId)
end
elseif not funcData.isActive and isActive then
--Log(">>>>>>功能解锁id = "..funcInfo.Id..", name = "..funcInfo.Name)
-- 未解锁,但是判断已解锁
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen, typeId)
--Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen, typeId)
table.insert(ids,typeId)
elseif funcData.isActive and not isActive then
--Log(">>>>>>功能关闭id = "..funcInfo.Id..", name = "..funcInfo.Name)
-- 已解锁但是判断未解锁
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionClose, typeId)
--Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionClose, typeId)
table.insert(ids,typeId)
end
-- 保存状态
funcData.isActive = isActive
end
end
table.sort(ids,function(a,b)
local aGuideId = AllActSetConfig[a].GuideId
local bGuideId = AllActSetConfig[b].GuideId
if (GuideConfig[aGuideId] and GuideConfig[bGuideId]) then
return GuideConfig[aGuideId].Sort < GuideConfig[bGuideId].Sort
elseif (not GuideConfig[aGuideId] and not GuideConfig[aGuideId]) then
return a < b
else
return GuideConfig[aGuideId] and not GuideConfig[bGuideId]
end
end)
for i = 1 ,#ids do
Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen, ids[i])
end
end
-- 初始化服务器数据

View File

@ -2840,6 +2840,7 @@ function this.GetFormationHeroRedPoint()
end
--化虚坛红点判断
function this.GetAllHeroCompoundRedPoint()
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then
for i, v in pairs(heroDatas) do
if v.star == 4 or v.star == 5 then
if this.IsShowUpStarRedPoint(v,true) then
@ -2847,6 +2848,7 @@ function this.GetAllHeroCompoundRedPoint()
end
end
end
end
return false
end
--单个英雄所有红点判断

View File

@ -70,6 +70,8 @@ function this:InitComponent()
this.logo.gameObject:SetActive(true)
this.logo.sprite = this.spLoader:LoadSprite(logoStr)
this.logo:SetNativeSize()
-- 特效只有在特殊背景显示
Util.GetGameObject(this.btnLoginPart, "effect (1)"):SetActive(logoStr == "dl_ui_effect_bg")
else
this.logo.gameObject:SetActive(false)
end

View File

@ -236,13 +236,16 @@ function this:RemoveListener()
end
function this.InitFuncShow(funcType)
LogGreen("funcType:"..funcType.." "..tostring(funcType == FUNCTION_OPEN_TYPE.ENDLESS).." CarbonManager.carbonType:"..CarbonManager.carbonType)
if funcType == FUNCTION_OPEN_TYPE.ENDLESS and CarbonManager.carbonType == CARBON_TYPE.ENDLESS then
this.SetEndlessShow()
end
end
function this:OnShow()
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
this.InitFuncShow()
return
end
UIManager.camera.clearFlags = CameraClearFlags.Depth
local mapId = MapManager.curMapId
--- 副本地图音效统一改成一个

View File

@ -166,6 +166,7 @@ function PlayerLiveView:OnShowLive()
local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale)
local y=curArtResourcesConfig.Position[2]+curPlayerRole.Height
if isRide then
LogError("name height=="..self.nameHeight)
y=y+3+self.nameHeight
end
local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],y,0)
@ -174,6 +175,8 @@ function PlayerLiveView:OnShowLive()
local effect=0
if self.posType==NPCPosType.maincity then
effect=self.transform.localScale.x
elseif self.posType==NPCPosType.onHook then
effect=50
else
effect=self.leader.transform.localScale.x
end

View File

@ -159,7 +159,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
npc = NameManager.roleSex == ROLE_SEX.BOY and npc1 or npc2
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 = PlayerLiveView:New(self.roleRoot,1,nil,sortingorder,NPCPosType.onHook)
self.playerLiveView:RemoveTitleCanvas()
self.nameDi.gameObject:SetActive(false)
--如果修行开启设置修行标识
@ -176,7 +176,8 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
sex = data.sex,
ride = data.userMount,
designation = data.userTitle,
})
},sortingorder,NPCPosType.onHook)
self.playerLiveView:SetNameHeight(1.5)
self.playerLiveView:RemoveTitleCanvas()
if data.userMount == 0 then
self.nameDi.transform.localPosition = namePos[1].pos

View File

@ -61,10 +61,10 @@ public class GameStart : MonoBehaviour
GameObject gameObj = bundle.LoadAsset<GameObject>("SplashPanel");
GameObject gameObj2 = Instantiate(gameObj, Vector3.zero, Quaternion.identity);
Image image = gameObj2.transform.Find("Canvas/image").GetComponent<Image>();
Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent<Image>();
image2.DOFade(1, 0).OnComplete(() => {
image2.DOFade(0, 0).SetDelay(0).OnComplete(() => {
//Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent<Image>();
//image2.gameObject.SetActive(false);
//image2.DOFade(1, 0).OnComplete(() => {
// image2.DOFade(0, 0).SetDelay(0).OnComplete(() => {
image.color = new Color(image.color.r, image.color.g, image.color.b, 0);
image.DOFade(1, 1).OnComplete(() => {
image.DOFade(0, 1).SetDelay(2).OnComplete(() => {
@ -75,8 +75,8 @@ public class GameStart : MonoBehaviour
//StartCoroutine(playMovice());
});
});
});
});
// });
//});
}
else
{