【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-11 10:06:49 +08:00
parent ee7b2b9919
commit c104bd65a7
18 changed files with 9990 additions and 2589 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c5449c7c5abbaa94da4687c27099b815
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

View File

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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6afa5ddc955213a4984ee10bf1600b62
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 05e2e4966d611464fb991ff8cd2ee734
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1006,6 +1006,7 @@ RedPointType = {
TreasureStoreSeason2 = 880,--主城
--新三界降魔
DemonSlayerNew = 890,--新三界降魔
LingMaiMiJing = 920,--灵脉秘境
}
RedPointStatus = {
@ -1570,6 +1571,7 @@ FUNCTION_OPEN_TYPE = {
PLAYER_SKILL = 115, --主角技能
shenhun = 116,
WEEK_CARD = 117, -- 周卡
LINGMAIMIJING = 118,--灵脉秘境
}
TaskGetBtnIconDef = {
@ -1792,6 +1794,7 @@ HELP_TYPE = {
shenhun =113,
DemonSlayerNew=114,--新三界除魔
WeekCard=115,--周卡
LingMaiMiJing = 116,--灵脉秘境
}
NumToComplexFont = {
@ -2688,7 +2691,8 @@ CompShowType = {
JumpServer_Type={
HightLadder = 1,--跨服天梯
YuXuLunDao = 2, --玉虚论道 跨服竞技场
QiJieShiLian = 3 --七界试炼
QiJieShiLian = 3, --七界试炼
LingMaiMiJing = 4, --灵脉秘境
}
--跨服玩法阶段
JumpServer_Stage={

View File

@ -234,6 +234,9 @@ ConfigName = {
RidingSwardSence = "RidingSwardSence",
WeekcardConfig = "WeekcardConfig",
GuideBattleConfig = "GuideBattleConfig",
MServerLodeSetting = "MServerLodeSetting",
LodeConfig = "LodeConfig",
LodeRankReward = "LodeRankReward",
}
require "Framework/GameDataBase"

View File

@ -427,6 +427,7 @@ UIName = {
DemonSlayerNewPanel = 432, --新版三界降魔
RoleGodSoulLayout = 434, --神魂界面
RewardTalismanSingleShowPopup2 = 435, --新·魂灵宝
LingMaiMiJingPanel = 436,--灵脉秘境
}
SubUIConfig = {

View File

@ -3,6 +3,7 @@ local this = JumpServerManager
--天梯
local mServerArenaSetting = ConfigManager.GetConfig(ConfigName.MServerArenaSetting)
local mServerArenaReward = ConfigManager.GetConfig(ConfigName.MServerArenaReward)
local MServerLodeSetting = ConfigManager.GetConfig(ConfigName.MServerLodeSetting)
local stage = 0 --1 未开始 2 战斗阶段 3 膜拜阶段
local endTime = 0 --阶段结束时间戳
local arenaInfo--
@ -126,6 +127,9 @@ end
function this.GetYuxuIsStart()
return isStart >= mServerArenaSetting[2].OpenWeek
end
function this.GetLingMaiIsStart()
return isStart >= MServerLodeSetting[1].OpenWeek
end
-- 获取剩余挑战次数 特权
function this.GetCanBattleCount()

View File

@ -51,10 +51,21 @@ local type = {
tipStr = "",
state = 0,
},
[4] = {
id = -1,
[JumpServer_Type.LingMaiMiJing] = {
id = JumpServer_Type.LingMaiMiJing,
funcId = FUNCTION_OPEN_TYPE.LINGMAIMIJING,
sort = 4,
bg = "r_Dungeon_rendi_01"
bg = "m_syjm_0026_png",
name = "q_qjsl_rikou_ysz",
live = "",
livePos = Vector2(0,0),
liveSize = Vector2(0,0),
tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[137].Value),
tip = "",
redPointType = RedPointType.LingMaiMiJing,
tipStr = "",
state = 0,
},
}
@ -188,6 +199,10 @@ function JumpServerPanel:BtnClick(id)
end
end)
end
if id == JumpServer_Type.LingMaiMiJing then
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
self:ClosePanel()
end
end
function JumpServerPanel:OnSortingOrderChange()
@ -277,6 +292,26 @@ function JumpServerPanel:SystemState(id,fun)
type[id].tipStr = ""
end
func()
elseif id== JumpServer_Type.LingMaiMiJing then
-- 判断功能是否开启
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.LINGMAIMIJING) then
type[id].state = -1
type[id].tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.LINGMAIMIJING)
func()
return
end
-- 跨服相关判断
if not JumpServerManager.GetLingMaiIsStart() then
type[id].state = -4
type[id].tipStr = string.format("开服第%s周开放",ConfigManager.GetConfigData(ConfigName.MServerLodeSetting,1).OpenWeek)
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
type[id].state = -5
type[id].tipStr = "未划分跨服分组,无法参与!"
else
type[id].state = 1
type[id].tipStr = ""
end
func()
end
end

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4b38db1f7336a634abaccd8e3ff48555
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
LingMaiMiJingManager = {}
local this = LingMaiMiJingManager
function this.Initialize()
end
return LingMaiMiJingManager

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9d69685283746b947a4aae414872c6f4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,53 @@
require("Base/BasePanel")
local LingMaiMiJingPanel = Inherit(BasePanel)
--初始化组件(用于子类重写)
function LingMaiMiJingPanel:InitComponent()
self.spLoader = SpriteLoader.New()
-- 屏幕适配修改
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
self.backBtn = Util.GetGameObject(self.gameObject,"backBtn")
self.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
end
--绑定事件(用于子类重写)
function LingMaiMiJingPanel:BindEvent()
Util.AddClick(self.backBtn,function()
self:ClosePanel()
end)
Util.AddOnceClick(self.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.LingMaiMiJing,self.helpPosition.x,self.helpPosition.y)
end)
end
--添加事件监听(用于子类重写)
function LingMaiMiJingPanel:AddListener()
end
--移除事件监听(用于子类重写)
function LingMaiMiJingPanel:RemoveListener()
end
--跨服
function LingMaiMiJingPanel:OnOpen()
self.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.QiJie})
end
--界面打开时调用(用于子类重写)
function LingMaiMiJingPanel:OnShow()
self:Refresh()
end
function LingMaiMiJingPanel:Refresh()
end
--界面关闭时调用(用于子类重写)
function LingMaiMiJingPanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function LingMaiMiJingPanel:OnDestroy()
self.spLoader:Destroy()
end
return LingMaiMiJingPanel

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb2f6fee3a8ace948bb8548dc8c9c8cf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -47,10 +47,9 @@ function HelpPopup:RemoveListener()
end
--界面打开时调用(用于子类重写)
function HelpPopup:OnOpen(QAConfigID,posX,poxY)
function HelpPopup:OnOpen(_QAConfigID,posX,poxY)
this.QAConfigID = _QAConfigID
this.Rect=Util.GetGameObject(self.transform,"HelpPopup"):GetComponent("RectTransform")
this.configData=ConfigManager.GetConfigData(ConfigName.QAConfig,QAConfigID)
this.helpBtnPosX=posX
this.helpBtnPosY=poxY
@ -88,6 +87,13 @@ function HelpPopup:OnShow()
this.RContentroot:SetActive(false)
this.LContentroot:SetActive(false)
this.configData=ConfigManager.TryGetConfigData(ConfigName.QAConfig,this.QAConfigID)
if not this.configData then
LogError("不存在的QAid:"..tostring(this.QAConfigID))
this:ClosePanel()
return
end
local str=GetLanguageStrById(this.configData.content)
str = string.gsub(str,"{","<color=#D48A07>")
str = string.gsub(str,"}","</color>")