Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
620a859c09
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 66e50a33b36393249adabe59a650e839
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 2.5 MiB |
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aa6cb4e68932d0b449ea369469079ad6
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: d_xinjiang_1
|
||||
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: 2
|
||||
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: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
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:
|
||||
- serializedVersion: 2
|
||||
name: d_xinjiang_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1080
|
||||
height: 1699
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 503432763af68a04c915dd12760e6882
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: c2707be991841054b807e1caa897af49
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 202 KiB |
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f53dcad4ca59d304f829e7fe1130f637
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: d_xinjiang_2
|
||||
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: 2
|
||||
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: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
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:
|
||||
- serializedVersion: 2
|
||||
name: d_xinjiang_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 842
|
||||
height: 228
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 7d985ff9566efda418b9eae032538219
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2ffd77a2c9d6e3544b71633de93b0f50
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -1157,7 +1157,9 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224690885248152168}
|
||||
- component: {fileID: 114278355066338524}
|
||||
- component: {fileID: 1452358353796855532}
|
||||
- component: {fileID: 808419186763003456}
|
||||
- component: {fileID: 3644189906011374913}
|
||||
m_Layer: 5
|
||||
m_Name: liveRoot
|
||||
m_TagString: Untagged
|
||||
|
@ -1184,7 +1186,7 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 1.2099915, y: -35.04001}
|
||||
m_SizeDelta: {x: 906.4, y: 1108.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &114278355066338524
|
||||
--- !u!114 &1452358353796855532
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -1193,9 +1195,47 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 1684447953370454}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowMaskGraphic: 0
|
||||
--- !u!222 &808419186763003456
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1684447953370454}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3644189906011374913
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1684447953370454}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1732673880281734
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -2524,7 +2524,8 @@ FacePanelType = {
|
|||
jianmushenshu = 17, --建木神树
|
||||
silnigshilian = 18, --四灵试炼
|
||||
redTreasure = 19, --红色品质宝物推送礼包
|
||||
jingjishilian = 20
|
||||
jingjishilian = 20, --
|
||||
XunXianZhaoMu = 21 -- 寻仙招募
|
||||
}
|
||||
--迷宫寻宝条件类型
|
||||
FindTreasureNeedType = {
|
||||
|
|
|
@ -140,6 +140,14 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change)
|
|||
end
|
||||
end
|
||||
|
||||
-- 限时引导小手
|
||||
function ActivityMainPanel:ShowGuideGo(guideType)
|
||||
--
|
||||
if subViewList[_CurPageIndex] and subViewList[_CurPageIndex].sub and subViewList[_CurPageIndex].sub.ShowGuideGo then
|
||||
subViewList[_CurPageIndex].sub:ShowGuideGo(guideType)
|
||||
end
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
function ActivityMainPanel:OnShow()
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
|
|
|
@ -447,6 +447,11 @@ function TimeLimitUpHero:TimeToDHMS(second)
|
|||
end
|
||||
end
|
||||
|
||||
--
|
||||
function TimeLimitUpHero:ShowGuideGo()
|
||||
JumpManager.ShowGuide(UIName.ActivityMainPanel, self.btn_hero)
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function TimeLimitUpHero:OnClose()
|
||||
self.gameObject:SetActive(false)
|
||||
|
|
|
@ -120,6 +120,13 @@ function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum
|
|||
elseif v.OpenRules[1] == 7 then
|
||||
--巅峰战
|
||||
this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||
elseif v.OpenRules[1] == 8 then -- 根据开服时间判断
|
||||
local serverOpenTime = PlayerManager.GetServerOpenTime()
|
||||
local openDay = math.ceil(math.max(0, GetTimeStamp() - serverOpenTime)/(60*60*24))--当前是开服第几天
|
||||
-- LogError("当前是开服第几天了:"..openDay)
|
||||
if openDay >= v.OpenRules[2] and openDay < v.CloseRules[2] then
|
||||
this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||
end
|
||||
end
|
||||
end
|
||||
function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||
|
|
|
@ -8,7 +8,7 @@ local diffItemTabs = {}--天恩神赐异妖获得物品
|
|||
local guildWarRewardTabs = {}--公会战奖励
|
||||
local cursortingOrder
|
||||
local PatFaceFindFairy = require("Modules/Expert/PatFaceFindFairy")
|
||||
local patFaceFindFairy
|
||||
local PatFaceXunXian = require("Modules/Expert/PatFaceXunXian")
|
||||
--初始化组件(用于子类重写)
|
||||
function PatFacePanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
@ -67,7 +67,7 @@ function PatFacePanel:InitComponent()
|
|||
self.effext3 = Util.GetGameObject(self.transform, "frame/obg1/effect/UI_effect_PatFacePanel_obg1_normal_particle")
|
||||
self.effext4 = Util.GetGameObject(self.transform, "frame/obg1/effect/UI_effect_PatFacePanel_obg1_start")
|
||||
--东海寻仙拍脸
|
||||
patFaceFindFairy = PatFaceFindFairy.new(self, Util.GetGameObject(self.transform, "frame/obg6"))
|
||||
self.pfFindFairy = PatFaceFindFairy.new(self, Util.GetGameObject(self.transform, "frame/obg6"))
|
||||
self.obg6 = Util.GetGameObject(self.transform, "frame/obg6")
|
||||
self.obg6goJumpBtn = Util.GetGameObject(self.transform, "frame/obg6/goJumpBtn")
|
||||
self.tipImage=Util.GetGameObject(self.transform,"frame/obg6/activityTextIcon/Image"):GetComponent("Image")
|
||||
|
@ -79,6 +79,9 @@ function PatFacePanel:InitComponent()
|
|||
self.obg9 = Util.GetGameObject(self.transform, "frame/obg9")
|
||||
-- 特惠神装活动
|
||||
-- self.obg10 = Util.GetGameObject(self.transform, "frame/obg10")
|
||||
-- 寻仙招募
|
||||
self.obg11 = Util.GetGameObject(self.transform, "frame/obg11")
|
||||
self.pfXunXian = PatFaceXunXian.new(self, self.obg11)
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -140,6 +143,7 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin)
|
||||
-- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
|
||||
-- self.obg10:SetActive(patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang)
|
||||
self.obg11:SetActive(patFaceSingleData.Type == FacePanelType.XunXianZhaoMu)
|
||||
if patFaceSingleData.Type == FacePanelType.Sbtj then
|
||||
self:OnShowOb1Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.Tesc then
|
||||
|
@ -173,6 +177,8 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self:OnShowOb10Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.jingjishilian then
|
||||
UIManager.OpenPanel(UIName.JingjishiLianPatface,function() self:ClosePanel() end)
|
||||
elseif patFaceSingleData.Type == FacePanelType.XunXianZhaoMu then
|
||||
self:OnShowOb11Data()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -354,7 +360,7 @@ function PatFacePanel:OnShowOb5Data()
|
|||
-- end
|
||||
end
|
||||
function PatFacePanel:OnShowOb6Data()
|
||||
patFaceFindFairy.OnShow(self,patFaceSingleData)
|
||||
self.pfFindFairy:OnShow(patFaceSingleData)
|
||||
Util.AddOnceClick(self.obg6goJumpBtn, function()
|
||||
self:JumpBtnClickEvent()
|
||||
end)
|
||||
|
@ -399,6 +405,11 @@ end
|
|||
-- function PatFacePanel:OnShowOb10Data()
|
||||
-- UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel,function() self:ClosePanel() end)
|
||||
-- end
|
||||
--第十一种 --寻仙招募
|
||||
function PatFacePanel:OnShowOb11Data()
|
||||
self.pfXunXian:OnShow(patFaceSingleData)
|
||||
end
|
||||
|
||||
|
||||
function PatFacePanel:JumpBtnClickEvent()
|
||||
if openPanle then
|
||||
|
@ -426,7 +437,8 @@ function PatFacePanel:OnClose()
|
|||
timeOb5:Stop()
|
||||
timeOb5 = nil
|
||||
end
|
||||
patFaceFindFairy.OnClose()
|
||||
self.pfFindFairy:OnClose()
|
||||
self.pfXunXian:OnClose()
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
local patFaceXunXian = quick_class("patFaceFindFairy")
|
||||
local _Config = {
|
||||
10090, 10040, 10085, 10086 -- 织女, 杨戬, 敖丙, 不动明王
|
||||
}
|
||||
function patFaceXunXian:ctor(mainPanel, gameObject)
|
||||
self.mainPanel = mainPanel
|
||||
self.gameObject = gameObject
|
||||
self:InitComponent(gameObject)
|
||||
self:BindEvent()
|
||||
end
|
||||
function patFaceXunXian:InitComponent(go)
|
||||
self.nameList = {}
|
||||
for i = 1, 4 do
|
||||
self.nameList[i] = {}
|
||||
self.nameList[i].go = Util.GetGameObject(go, "hero/h"..i)
|
||||
end
|
||||
|
||||
self.goJumpBtn = Util.GetGameObject(go, "goJumpBtn")
|
||||
self.btnBack = Util.GetGameObject(go, "btnBack")
|
||||
end
|
||||
function patFaceXunXian:BindEvent()
|
||||
for i = 1, 4 do
|
||||
Util.AddOnceClick(self.nameList[i].go, function()
|
||||
LogError(_Config[i])
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, _Config[i], 5)
|
||||
end)
|
||||
end
|
||||
Util.AddOnceClick(self.goJumpBtn, function()
|
||||
self.mainPanel:JumpBtnClickEvent()
|
||||
end)
|
||||
|
||||
Util.AddClick(self.btnBack, function()
|
||||
UIManager.ClosePanel(UIName.PatFacePanel)
|
||||
end)
|
||||
end
|
||||
function patFaceXunXian:OnShow(data)
|
||||
end
|
||||
function patFaceXunXian:OnClose()
|
||||
end
|
||||
|
||||
return patFaceXunXian
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6c2d8aec3c7942840a46db88486bcfae
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -4272,7 +4272,7 @@ function this.InVersion(heroTid)
|
|||
return
|
||||
end
|
||||
local serverOpenTime = PlayerManager.GetServerOpenTime()
|
||||
local openDay = math.max(0, GetTimeStamp() - serverOpenTime)/(60*60*24)--当前是开服第几天
|
||||
local openDay = math.ceil(math.max(0, GetTimeStamp() - serverOpenTime)/(60*60*24))--当前是开服第几天
|
||||
if openDay >= con.Version then
|
||||
return true
|
||||
end
|
||||
|
|
|
@ -695,7 +695,7 @@ local jumpDic = {
|
|||
end
|
||||
end,
|
||||
[JumpType.StateActivity] = function (data)
|
||||
this.JumpActivity(JumpType.StateActivity,data[1])
|
||||
this.JumpActivity(JumpType.StateActivity,data[1], data[2])
|
||||
end,
|
||||
[JumpType.FightLevel] = function (data)
|
||||
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
||||
|
@ -901,7 +901,7 @@ local jumpDic = {
|
|||
end,
|
||||
}
|
||||
|
||||
function this.JumpActivity(data,skipfactor)
|
||||
function this.JumpActivity(data,skipfactor, guideType)
|
||||
local isOpen = DynamicActivityManager.IsActivityOpenByJumpIndex(data, skipfactor)
|
||||
if not isOpen then
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
|
@ -920,7 +920,11 @@ function this.JumpActivity(data,skipfactor)
|
|||
UIManager.ClosePanel(UIName.ActivityMainPanel)
|
||||
end
|
||||
DynamicActivityManager.AddUIList(this.jumpId)
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,data,skipfactor)
|
||||
local panel = UIManager.OpenPanel(UIName.ActivityMainPanel,data,skipfactor)
|
||||
-- 限时引导光效
|
||||
if guideType and guideType > 0 then
|
||||
panel:ShowGuideGo(guideType)
|
||||
end
|
||||
end
|
||||
-- function this.GetTip(openType,openValue)
|
||||
-- if openType == 1 then
|
||||
|
|
|
@ -99,20 +99,22 @@ function this.GetNewTalentDataShow()
|
|||
local breakSkillDataList = {}
|
||||
local upStarSkillDataList = {}
|
||||
if heroConfig.Awaken then
|
||||
for i = 1, #heroConfig.Awaken do
|
||||
local Desc = GetLanguageStrById(passiveSkillConfig[heroConfig.Awaken[i][3]].Desc)
|
||||
local Awaken=heroConfig.Awaken
|
||||
Awaken=GetPassiveByMaxStar(heroConfig,heroConfig.Awaken)
|
||||
for i = 1, #Awaken do
|
||||
local Desc = GetLanguageStrById(passiveSkillConfig[Awaken[i][3]].Desc)
|
||||
if heroConfig.Awaken[i][1] == 1 then--突破
|
||||
local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.Awaken[i][2]].Phase[2]] .. Language[11795]
|
||||
local curBreakId = heroConfig.Awaken[i][2]
|
||||
local titleStr = NumToSimplenessFont[heroRankupConfig[Awaken[i][2]].Phase[2]] .. Language[11795]
|
||||
local curBreakId = Awaken[i][2]
|
||||
if breakSkillDataList[curBreakId] then
|
||||
breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = GetLanguageStrById(breakSkillDataList[curBreakId].str) .. " <color=#66FF00>"..Desc.."</color>"}
|
||||
else
|
||||
breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str ="<color=#66FF00>"..titleStr..Desc.."</color>"}
|
||||
end
|
||||
else--升星
|
||||
local curUpStarId = heroConfig.Awaken[i][2]
|
||||
local curUpStarId = Awaken[i][2]
|
||||
local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792]
|
||||
local _passiveSkillId = passiveSkillConfig[heroConfig.Awaken[i][3]].Id
|
||||
local _passiveSkillId = passiveSkillConfig[Awaken[i][3]].Id
|
||||
if upStarSkillDataList[curUpStarId] then
|
||||
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. " <color=#66FF00>"..Desc.."</color>"}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue