parent
3f1ab4f07f
commit
5838089889
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 134506be7b4d980489f2675fac926724
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0ad111be58cef4d499b20ed047985366
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: CarbonNewAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ea294d09e6e74024cbe93a1b2f6f5032
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 54e13b0c4422b8346851f8e11e513f75
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: CarbonNewAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1719,7 +1719,7 @@ FUNCTION_OPEN_TYPE = {
|
|||
LUCKYTURN=61, --幸运探宝(活动变功能)
|
||||
GUILD_BOSS=62, -- 公会boss
|
||||
GUILD_REDPACKET=63, -- 公会红包
|
||||
EXPEDITION=64, -- 远征
|
||||
EXPEDITION=64, -- 远征 (大闹天宫)
|
||||
Achiecement=65, -- 成就
|
||||
COMPOUND=66, -- 锻造炉
|
||||
DAILYCHALLENGE_COIN=67,--每日金币副本
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ function this.GetDailyCarbons(index)
|
|||
this.dailyCarbons={}
|
||||
end
|
||||
if index == 0 then
|
||||
for i = 1, 4 do
|
||||
for i = 1, 2 do --現在之保留 1 和 2
|
||||
this.GetCarBonState(i)
|
||||
end
|
||||
return this.dailyCarbons
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ local maxFreeTime=0
|
|||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabData={ [1] = { default = "r_richang_anniu_jinbi_01_zh", select = "r_richang_anniu_jinbi_zh",lock = "r_richang_anniu_jinbi_zh", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
|
||||
[2] = { default = "r_richang_anniu_jingyan_01_zh", select = "r_richang_anniu_jingyan_zh",lock = "r_richang_anniu_jingyan_zh", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
|
||||
[3] = { default = "r_richang_anniu_lieyaoshi_01_zh", select = "r_richang_anniu_lieyaoshi_zh",lock = "r_richang_anniu_lieyaoshi_zh", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS },
|
||||
[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN },
|
||||
[5] = { default = "r_richang_anniu_hunyin_01_zh", select = "r_richang_anniu_hunyin_zh",lock = "r_richang_anniu_hunyin_zh", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT }
|
||||
--[3] = { default = "r_richang_anniu_lieyaoshi_01_zh", select = "r_richang_anniu_lieyaoshi_zh",lock = "r_richang_anniu_lieyaoshi_zh", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS },
|
||||
--[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN },
|
||||
--[5] = { default = "r_richang_anniu_hunyin_01_zh", select = "r_richang_anniu_hunyin_zh",lock = "r_richang_anniu_hunyin_zh", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT }
|
||||
}
|
||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1),
|
||||
|
|
|
|||
|
|
@ -11,15 +11,24 @@ local expeditionLevel = {
|
|||
}
|
||||
|
||||
local carbonData = {
|
||||
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = {
|
||||
-- id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
|
||||
-- objName = "expedition",
|
||||
-- nameImg = "f_fuben_fubenming_03",
|
||||
-- btnPos = Vector2(39,-67),
|
||||
-- redPointType = RedPointType.OrdinaryExplore,
|
||||
-- effect1 = "Fx_DaNaoTianGong",
|
||||
-- effect2 = "Fx_DaNaoTianGong_S",
|
||||
-- },
|
||||
--[FUNCTION_OPEN_TYPE.EXPEDITION] = {
|
||||
-- id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
|
||||
-- objName = "expedition",
|
||||
-- nameImg = "f_fuben_fubenming_03",
|
||||
-- btnPos = Vector2(39,-67),
|
||||
-- redPointType = RedPointType.OrdinaryExplore,
|
||||
-- effect1 = "Fx_DaNaoTianGong",
|
||||
-- effect2 = "Fx_DaNaoTianGong_S",
|
||||
--},
|
||||
[FUNCTION_OPEN_TYPE.QIJIESHILIAN] = {
|
||||
id = FUNCTION_OPEN_TYPE.QIJIESHILIAN, --七界试炼
|
||||
objName = "expedition",
|
||||
nameImg = "f_fuben_fubenming_10",
|
||||
btnPos = Vector2(39,-67),
|
||||
redPointType = RedPointType.QiJieShiLian,
|
||||
effect1 = "Fx_DaNaoTianGong",
|
||||
effect2 = "Fx_DaNaoTianGong_S",
|
||||
},
|
||||
[FUNCTION_OPEN_TYPE.PEOPLE_MIRROR] = {
|
||||
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
|
||||
objName = "xuanyuan",
|
||||
|
|
@ -74,6 +83,15 @@ local carbonData = {
|
|||
-- effect1 = "Fx_SenLuoHuanJjing",
|
||||
-- effect2 = "Fx_SenLuoHuanJjing_S",
|
||||
-- },
|
||||
[FUNCTION_OPEN_TYPE.LINGMAIMIJING] = {
|
||||
id = FUNCTION_OPEN_TYPE.HOMELAND, --灵脉秘境
|
||||
objName = "trial",
|
||||
nameImg = "f_fuben_fubenming_09",
|
||||
btnPos = Vector2(-156,-12),
|
||||
redPointType = RedPointType.LingMaiMiJing,
|
||||
effect1 = "Fx_SenLuoHuanJjing",
|
||||
effect2 = "Fx_SenLuoHuanJjing_S",
|
||||
},
|
||||
[FUNCTION_OPEN_TYPE.GodsWayTower_1] = {
|
||||
id = FUNCTION_OPEN_TYPE.GodsWayTower_1, --多队塔
|
||||
objName = "other",
|
||||
|
|
@ -416,7 +434,61 @@ function CarbonsPanel:BtnClick(id)
|
|||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
|
||||
end
|
||||
elseif id==FUNCTION_OPEN_TYPE.QIJIESHILIAN then --七界试炼
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
|
||||
NetManager.SevenWorldInfoRequest(0,function (msg)
|
||||
QiJieShiLianManager.IsLock = false
|
||||
if qiejieConfig[msg.id] then
|
||||
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
|
||||
else
|
||||
LogError("七界试炼不存在该ID:"..tostring(msg.id))
|
||||
PopupTipPanel.ShowTip("无法进入,请联系客服!")
|
||||
end
|
||||
end)
|
||||
else
|
||||
JumpManager.GoJump(40059)
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
|
||||
end
|
||||
elseif id==FUNCTION_OPEN_TYPE.HOMELAND then --洞府
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
JumpManager.GoJump(40059)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
|
||||
end
|
||||
elseif id==FUNCTION_OPEN_TYPE.LINGMAIMIJING then --洞府
|
||||
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.LINGMAIMIJING) then
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.LINGMAIMIJING))
|
||||
return
|
||||
end
|
||||
-- 跨服相关判断
|
||||
if not JumpServerManager.GetLingMaiIsStart() then
|
||||
PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerLodeSetting,1).OpenWeek))
|
||||
return
|
||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||
PopupTipPanel.ShowTip("未划分跨服分组,无法参与!")
|
||||
return
|
||||
end
|
||||
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
NetManager.GetLingMaiInfoRequest(0,function ()
|
||||
if LingMaiMiJingManager.state == 0 then
|
||||
PopupTipPanel.ShowTip("今日不开放灵脉秘境玩法!")
|
||||
else
|
||||
if not LingMaiMiJingManager.GetData() then
|
||||
LogError("灵脉试炼数据为空")
|
||||
PopupTipPanel.ShowTip("灵脉暂无法进入,请耐心等待!")
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.LingMaiMiJingPanel)
|
||||
end
|
||||
end)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
function CarbonsPanel:OnSortingOrderChange()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ local type = {
|
|||
[JumpServer_Type.YuXuLunDao] = {
|
||||
id = JumpServer_Type.YuXuLunDao,
|
||||
funcId = FUNCTION_OPEN_TYPE.JumpServer_YuXu,
|
||||
sort = 3,
|
||||
sort = 2,
|
||||
bg = "r_Dungeon_rendi_01",
|
||||
name = "y_yuxulundao_yuxurukou_zh",
|
||||
live = "lingjijuyuan",
|
||||
|
|
@ -35,38 +35,38 @@ local type = {
|
|||
tipStr = "",
|
||||
state = 0,
|
||||
},
|
||||
[JumpServer_Type.QiJieShiLian] = {
|
||||
id = JumpServer_Type.QiJieShiLian,
|
||||
funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN,
|
||||
sort = 2,
|
||||
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[127].Value),
|
||||
tip = "",
|
||||
redPointType = RedPointType.QiJieShiLian,
|
||||
tipStr = "",
|
||||
state = 0,
|
||||
},
|
||||
[JumpServer_Type.LingMaiMiJing] = {
|
||||
id = JumpServer_Type.LingMaiMiJing,
|
||||
funcId = FUNCTION_OPEN_TYPE.LINGMAIMIJING,
|
||||
sort = 4,
|
||||
bg = "r_Dungeon_rendi_01",
|
||||
name = "l_lmmj_rukouzi",
|
||||
live = "z_zddh_yj",
|
||||
livePos = Vector2(251,-26),
|
||||
liveSize = Vector2(550,500),
|
||||
tipBg = "r_Dungeon_rendi_01",
|
||||
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[137].Value),
|
||||
tip = "",
|
||||
redPointType = RedPointType.LingMaiMiJing,
|
||||
tipStr = "",
|
||||
state = 0,
|
||||
},
|
||||
-- [JumpServer_Type.QiJieShiLian] = {
|
||||
-- id = JumpServer_Type.QiJieShiLian,
|
||||
-- funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN,
|
||||
-- sort = 3,
|
||||
-- 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[127].Value),
|
||||
-- tip = "",
|
||||
-- redPointType = RedPointType.QiJieShiLian,
|
||||
-- tipStr = "",
|
||||
-- state = 0,
|
||||
-- },
|
||||
-- [JumpServer_Type.LingMaiMiJing] = {
|
||||
-- id = JumpServer_Type.LingMaiMiJing,
|
||||
-- funcId = FUNCTION_OPEN_TYPE.LINGMAIMIJING,
|
||||
-- sort = 4,
|
||||
-- bg = "r_Dungeon_rendi_01",
|
||||
-- name = "l_lmmj_rukouzi",
|
||||
-- live = "z_zddh_yj",
|
||||
-- livePos = Vector2(251,-26),
|
||||
-- liveSize = Vector2(550,500),
|
||||
-- tipBg = "r_Dungeon_rendi_01",
|
||||
-- resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[137].Value),
|
||||
-- tip = "",
|
||||
-- redPointType = RedPointType.LingMaiMiJing,
|
||||
-- tipStr = "",
|
||||
-- state = 0,
|
||||
-- },
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -462,6 +462,7 @@ function this.GetShopDataByType(shopType)
|
|||
end
|
||||
end
|
||||
--assert(shopData, "未找到商店数据,请检查数据表及后端数据,商店类型 == "..shopType)
|
||||
--LogError("shopData len================="..#shopData)
|
||||
return shopData
|
||||
end
|
||||
-- 通过商店type获取商店数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue