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

dev_chengFeng
ZhangBiao 2021-06-04 16:10:28 +08:00
commit f0cd4b3bc0
6 changed files with 37 additions and 22 deletions

View File

@ -2313,14 +2313,14 @@ BATTLE_TYPE = {
Senro = 12, -- 森罗幻境 Senro = 12, -- 森罗幻境
XuanYuan = 13, -- 轩辕宝镜 XuanYuan = 13, -- 轩辕宝镜
GuildTranscript = 14, -- 公会副本 GuildTranscript = 14, -- 公会副本
ARENA = 15, -- 竞技场 ARENA = 15, -- 竞技场
XINJIANG = 16, --新将来袭 XINJIANG = 16, --新将来袭
XIAOYAOYOU = 18, --逍遥游战斗 XIAOYAOYOU = 18, --逍遥游战斗
TASUILINGXIAO = 19, --踏碎凌霄 TASUILINGXIAO = 19, --踏碎凌霄
FIGHTLEVEL = 20, --山河社稷图主关卡 FIGHTLEVEL = 20, --山河社稷图主关卡
FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗 FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗
BACK_BATTLE = 1000, -- 系统战斗回放 BACK_BATTLE = 1000, -- 系统战斗回放
EndlessMpaFight = 22, EndlessMpaFight = 22, -- 无尽副本
} }
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true}, rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true}, [2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},

View File

@ -9,7 +9,7 @@ function PackageManager.Initialize()
-- 获取当前包配置名,没有就按本地配置 -- 获取当前包配置名,没有就按本地配置
this.ConfigName = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CONFIG) this.ConfigName = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.PACKAGE_CONFIG)
if this.ConfigName then if not this.ConfigName then
this.ConfigName = "LOCAL" this.ConfigName = "LOCAL"
end end
@ -64,15 +64,19 @@ function PackageManager.SetVideo(obj, bg)
if this.config.VideoName then if this.config.VideoName then
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_LOGIN_VIDEO) then if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_LOGIN_VIDEO) then
Log("加载视频:"..tostring(this.config.VideoName)) Log("加载视频:"..tostring(this.config.VideoName))
resMgr:PreLoadAssetAsync(this.config.VideoName, function() resMgr:PreLoadAssetAsync(this.config.VideoName, function(isOk)
if UIManager.IsOpen(UIName.LoginPanel) then if isOk then
local video = obj:GetComponent("VideoPlayer") if UIManager.IsOpen(UIName.LoginPanel) then
-- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4" local video = obj:GetComponent("VideoPlayer")
-- video.clip = resMgr:LoadAsset(this.config.VideoName) -- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4"
video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName) -- video.clip = resMgr:LoadAsset(this.config.VideoName)
video:Play() video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName)
bg:DOFade(0, 2) video:Play()
obj:SetActive(true) bg:DOFade(0, 2)
obj:SetActive(true)
end
else
LogError("视频加载失败:"..this.config.VideoName)
end end
end) end)
end end

View File

@ -882,10 +882,19 @@ function this.GetBattleBg(fightType)
index = 1002 index = 1002
elseif fightType == BATTLE_TYPE.XuanYuan then elseif fightType == BATTLE_TYPE.XuanYuan then
index = 1003 index = 1003
elseif fightType == BATTLE_TYPE.DEATH_POS then elseif fightType == BATTLE_TYPE.DEATH_POS
or fightType == BATTLE_TYPE.MONSTER_CAMP
then
index = 1004 index = 1004
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
index = 1006 index = 1006
elseif fightType == BATTLE_TYPE.EndlessMpaFight then -- 无尽副本
index = 5
elseif fightType == BATTLE_TYPE.DAILY_CHALLENGE -- 日常副本
or fightType == BATTLE_TYPE.FIGHTLEVEL -- 山河社稷图
or fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL
then
index = 2
end end
return "r_zhandou_changjing_"..tostring(index) return "r_zhandou_changjing_"..tostring(index)
end end

View File

@ -50,9 +50,9 @@ local UpdateBtnGMFunc = {
if not BattleManager.IsUnlockBattlePass() then if not BattleManager.IsUnlockBattlePass() then
return SKIP_STATE.LOCK, "25级或充值任意金额后解锁" return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
end end
-- if FightPointPassManager.GetCurOpenFightIdIsBoss() then if FightPointPassManager.GetCurOpenFightIdIsBoss() then
-- return SKIP_STATE.NOUSE, "首领关卡无法跳过!" return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
-- end end
return SKIP_STATE.UNLOCK return SKIP_STATE.UNLOCK
end, end,
} }

View File

@ -177,7 +177,6 @@ function MyGuildManager.ReuqsetRedPackage(func)
NetManager.GetAllRedPacketResponse(function(msg) NetManager.GetAllRedPacketResponse(function(msg)
local num=0 local num=0
local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115) local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115)
LogError("--------------------")
for i = 1, #msg.info do for i = 1, #msg.info do
local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,msg.info[i].redType) local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,msg.info[i].redType)
if config and msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then if config and msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then
@ -186,12 +185,10 @@ function MyGuildManager.ReuqsetRedPackage(func)
end end
end end
end end
LogError("*************************")
this.PackageNum=num this.PackageNum=num
CheckRedPointStatus(RedPointType.Guid_GetPackage) CheckRedPointStatus(RedPointType.Guid_GetPackage)
CheckRedPointStatus(RedPointType.Guid_SendPackage) CheckRedPointStatus(RedPointType.Guid_SendPackage)
--CheckRedPointStatus(RedPointType.Guild_RedPacket) --CheckRedPointStatus(RedPointType.Guild_RedPacket)
LogError("///////////////////")
if func then if func then
func(msg) func(msg)
end end

View File

@ -118,6 +118,10 @@ function RedPacketPanel:OnClose()
this.contents[i].view:OnClose() this.contents[i].view:OnClose()
end end
ClearRedPointObject(RedPointType.Guild_RedPacket,this.redPoint) ClearRedPointObject(RedPointType.Guild_RedPacket,this.redPoint)
if redPointList[2] and redPointList[3] then
ClearRedPointObject(RedPointType.Guid_SendPackage, redPointList[2])
ClearRedPointObject(RedPointType.Guid_GetPackage, redPointList[3])
end
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)
@ -126,6 +130,7 @@ function RedPacketPanel:OnDestroy()
this.contents[i].view:OnDestroy() this.contents[i].view:OnDestroy()
this.spLoader:Destroy() this.spLoader:Destroy()
end end
redPointList=nil
end end