Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
88c10d8031
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6a6bf03d18970ff4fa36ea28106c083b
|
||||
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: 1577f74b04bb71f4083f0ae48f211f22
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 69 KiB |
|
@ -4644,7 +4644,7 @@ ParticleSystem:
|
|||
--- !u!199 &7230004319597149783
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -4777,6 +4777,44 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &342357161191094753
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5860093666912857526}
|
||||
m_Layer: 0
|
||||
m_Name: Prectice
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5860093666912857526
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 342357161191094753}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3818728531437821566}
|
||||
- {fileID: 3759887136319108211}
|
||||
- {fileID: 627347790913322735}
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &535413429869230351
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9559,7 +9597,7 @@ ParticleSystem:
|
|||
--- !u!199 &1731307604659967522
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14681,7 +14719,7 @@ ParticleSystem:
|
|||
--- !u!199 &984307701635933128
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -19707,7 +19745,7 @@ ParticleSystem:
|
|||
--- !u!199 &8722287443315113565
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -20479,8 +20517,8 @@ RectTransform:
|
|||
- {fileID: 5372197318280130239}
|
||||
- {fileID: 7937809792703614703}
|
||||
- {fileID: 7687275820350529986}
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 5860093666912857526}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
@ -20557,7 +20595,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2850777537733551215}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
@ -20565,8 +20603,8 @@ RectTransform:
|
|||
- {fileID: 1660741850867074862}
|
||||
- {fileID: 3798012906017567417}
|
||||
- {fileID: 8714706326752686439}
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
m_RootOrder: 4
|
||||
m_Father: {fileID: 5860093666912857526}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -25846,7 +25884,7 @@ ParticleSystem:
|
|||
--- !u!199 &5913121696673349157
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -30898,7 +30936,7 @@ ParticleSystem:
|
|||
--- !u!199 &7256114582625987229
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -35892,7 +35930,7 @@ ParticleSystem:
|
|||
--- !u!199 &4616072941791065012
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -36523,8 +36561,8 @@ RectTransform:
|
|||
- {fileID: 5901742240670988321}
|
||||
- {fileID: 161672366053446771}
|
||||
- {fileID: 6857431349622417075}
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
m_RootOrder: 3
|
||||
m_Father: {fileID: 5860093666912857526}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -42075,7 +42113,7 @@ ParticleSystem:
|
|||
--- !u!199 &4010181141157830801
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -46836,7 +46874,7 @@ ParticleSystem:
|
|||
--- !u!199 &4305352798707543493
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -51597,7 +51635,7 @@ ParticleSystem:
|
|||
--- !u!199 &6408994215580448071
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -56358,7 +56396,7 @@ ParticleSystem:
|
|||
--- !u!199 &2189434392852510045
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -62478,7 +62516,7 @@ ParticleSystem:
|
|||
--- !u!199 &673420127744576939
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -67283,7 +67321,7 @@ ParticleSystem:
|
|||
--- !u!199 &4960700602042547561
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -67372,7 +67410,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -67885,9 +67923,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6505040734003903047}
|
||||
- {fileID: 8126515032001170632}
|
||||
- {fileID: 3818728531437821566}
|
||||
- {fileID: 3759887136319108211}
|
||||
- {fileID: 627347790913322735}
|
||||
- {fileID: 5860093666912857526}
|
||||
- {fileID: 446848837023256862}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
|
@ -73338,7 +73374,7 @@ ParticleSystem:
|
|||
--- !u!199 &2426256442623294447
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -78154,7 +78190,7 @@ ParticleSystem:
|
|||
--- !u!199 &7003735107301579103
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -82879,7 +82915,7 @@ ParticleSystem:
|
|||
--- !u!199 &6462096629828664088
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -18,10 +18,16 @@ local onRageChange=function(caster,target,func,type,value)
|
|||
end
|
||||
|
||||
local onSkillCast=function(skill)
|
||||
if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then
|
||||
return
|
||||
end
|
||||
skill.owner.Event:AddEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner)
|
||||
end
|
||||
|
||||
local onSkillCastEnd=function(skill)
|
||||
if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then
|
||||
return
|
||||
end
|
||||
skill.owner.Event:RemoveEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner)
|
||||
end
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ function Monster:Init(data)
|
|||
self.teamDamage=data.teamDamage
|
||||
self.roleData = data
|
||||
self.sex=data.sex
|
||||
self.addAttack=0
|
||||
self.data:Init(self, data.property)
|
||||
self.buffFilter:Clear() --buff屏蔽列表
|
||||
self.Event:ClearEvent()
|
||||
|
|
|
@ -58,6 +58,7 @@ local function _GetBuffEffectConfig(buff)
|
|||
cType = 1
|
||||
elseif bType==BuffName.CommonSign then
|
||||
cType = 1
|
||||
|
||||
end
|
||||
|
||||
local type = BuffTypeToConfigType[bType]
|
||||
|
@ -342,6 +343,9 @@ function BuffCtrl:RemoveBuffIcon(buff)
|
|||
end
|
||||
return
|
||||
end
|
||||
else
|
||||
self.BuffIconList[key]:Dispose()
|
||||
self.BuffIconList[key] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,6 +8,11 @@ local BTNS = {
|
|||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"},
|
||||
[3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"},
|
||||
}
|
||||
local btnType = {
|
||||
LianGou = 1,
|
||||
Meiri = 2,
|
||||
ChaoZhi = 3,
|
||||
}
|
||||
|
||||
function ContinuePackagePanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
@ -31,7 +36,7 @@ function ContinuePackagePanel:InitComponent()
|
|||
self.scrollView.elastic = false
|
||||
self.itemViewList = {}
|
||||
self.sortingOrder = 0
|
||||
self.curPage = 1
|
||||
self.curPage = btnType.LianGou
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -141,6 +146,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index)
|
|||
btnText.gameObject:SetActive(false)
|
||||
obj:SetActive(false)
|
||||
canBuyTime.text = string.format( "剩余:%s次",data.progress)
|
||||
canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数
|
||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_anniu")
|
||||
if data.otherData.GoodType == 1 then--直购
|
||||
btnText.gameObject:SetActive(true)
|
||||
|
@ -205,12 +211,27 @@ function ContinuePackagePanel:SetTime()
|
|||
self.timer = nil
|
||||
end
|
||||
local time = self.actData.endTime - GetTimeStamp()
|
||||
local leftTime = time - 86280
|
||||
if self.curPage == btnType.Meiri and leftTime > 0 then--如果是每日特惠显示每日倒计时
|
||||
time = CalculateSecondsNowTo_N_OClock(24)
|
||||
end
|
||||
--每日特惠处理
|
||||
self.leftTime.text = Language[10512]..TimeToFelaxible(time)
|
||||
if self.curPage == btnType.Meiri then
|
||||
self.leftTime.text = Language[10023]..TimeToFelaxible(time)
|
||||
end
|
||||
self.timer = Timer.New(function ()
|
||||
if time <= 0 then
|
||||
if self.curPage == btnType.Meiri and leftTime > 0 then
|
||||
self:Refresh(false,false)
|
||||
return
|
||||
end
|
||||
self:ClosePanel()
|
||||
end
|
||||
self.leftTime.text = Language[10512]..TimeToFelaxible(time)
|
||||
if self.curPage == btnType.Meiri then
|
||||
self.leftTime.text = Language[10023]..TimeToFelaxible(time)
|
||||
end
|
||||
time = time -1
|
||||
end, 1, -1, true)
|
||||
self.timer:Start()
|
||||
|
|
|
@ -16,25 +16,27 @@ function Practice:InitComponent()
|
|||
end
|
||||
self.BtView = SubUIManager.Open(SubUIConfig.BtView, self.transform)
|
||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
||||
self.Practice = Util.GetGameObject(self.gameObject, "Prectice")
|
||||
--Btns
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "Btns/helpBtn")
|
||||
self.starBtn = Util.GetGameObject(self.gameObject, "Btns/starBtn")
|
||||
self.Btns = Util.GetGameObject(self.Practice, "Btns")
|
||||
self.helpBtn = Util.GetGameObject(self.Btns, "helpBtn")
|
||||
self.starBtn = Util.GetGameObject(self.Btns, "starBtn")
|
||||
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
self.previewBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/previewBtn")
|
||||
self.additionBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/additionBtn")
|
||||
self.cultivationBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/cultivationBtn")
|
||||
self.previewBtn = Util.GetGameObject(self.Btns, "leftGrid/previewBtn")
|
||||
self.additionBtn = Util.GetGameObject(self.Btns, "leftGrid/additionBtn")
|
||||
self.cultivationBtn = Util.GetGameObject(self.Btns, "leftGrid/cultivationBtn")
|
||||
self.cultivationRed = Util.GetGameObject(self.cultivationBtn, "redPoint")
|
||||
|
||||
self.imprintBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/imprintBtn")
|
||||
self.imprintBtn = Util.GetGameObject(self.Btns, "rightGrid/imprintBtn")
|
||||
self.imprintRedPoint = Util.GetGameObject(self.imprintBtn, "redPoint")
|
||||
self.fourQuadrantBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/yushenBtn")
|
||||
self.fourQuadrantBtn = Util.GetGameObject(self.Btns, "rightGrid/yushenBtn")
|
||||
self.fourQuadrantRedPoint = Util.GetGameObject(self.fourQuadrantBtn, "redPoint")
|
||||
self.starNum = Util.GetGameObject(self.starBtn, "starNum"):GetComponent("Text")
|
||||
self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/treeBtn")
|
||||
self.treeBtn = Util.GetGameObject(self.Btns, "rightGrid/treeBtn")
|
||||
self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint")
|
||||
self.talsmanSoulBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/talsmanSoulBtm")
|
||||
self.talsmanSoulBtn = Util.GetGameObject(self.Btns, "rightGrid/talsmanSoulBtm")
|
||||
self.talsmanSoulBtnRed = Util.GetGameObject(self.talsmanSoulBtn, "redPoint")
|
||||
self.incarnationBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/incarnationBtn")
|
||||
self.incarnationBtn = Util.GetGameObject(self.Btns, "leftGrid/incarnationBtn")
|
||||
self.incarnationBtnRed = Util.GetGameObject(self.incarnationBtn, "redPoint")
|
||||
|
||||
--MidPart
|
||||
|
@ -43,7 +45,7 @@ function Practice:InitComponent()
|
|||
self.img = Util.GetGameObject(self.mid, "Man"):GetComponent("Image")
|
||||
self.ManCanvas = Util.GetGameObject(self.mid, "Man"):GetComponent("Canvas")
|
||||
--BottomPart
|
||||
self.bottom = Util.GetGameObject(self.gameObject, "Bottom")
|
||||
self.bottom = Util.GetGameObject(self.Practice, "Bottom")
|
||||
self.items = Util.GetGameObject(self.bottom, "Items")
|
||||
self.PointPre = Util.GetGameObject(self.items, "PointPre")
|
||||
self.lines = Util.GetGameObject(self.bottom, "Lines")
|
||||
|
@ -74,11 +76,11 @@ function Practice:InitComponent()
|
|||
self.effectPointsList = {}
|
||||
self.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
|
||||
self.skillObj=Util.GetGameObject(self.gameObject, "SkillObj")
|
||||
self.skillObj=Util.GetGameObject(self.Practice, "SkillObj")
|
||||
self.skillList={}
|
||||
for i = 1, 4 do
|
||||
table.insert(self.skillList,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i))
|
||||
BindRedPointObject(5000+i*100,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i.."/red"))
|
||||
table.insert(self.skillList,Util.GetGameObject(self.Practice, "SkillObj/skill"..i))
|
||||
BindRedPointObject(5000+i*100,Util.GetGameObject(self.Practice, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -472,8 +474,7 @@ function Practice:OnDestroy()
|
|||
ClearRedPointObject(RedPointType.tailsmanSoul,self.talsmanSoulBtnRed)
|
||||
ClearRedPointObject(RedPointType.incarnation,self.incarnationBtnRed)
|
||||
for i = 1, 4 do
|
||||
-- table.insert(self.skillList,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i))
|
||||
ClearRedPointObject(500+i*100,Util.GetGameObject(self.gameObject, "SkillObj/skill"..i.."/red"))
|
||||
ClearRedPointObject(500+i*100,Util.GetGameObject(self.Practice, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
self.itemList = {}
|
||||
self.skillList={}
|
||||
|
|
Loading…
Reference in New Issue