Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
bb1e41633a
|
@ -47440,7 +47440,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: -0.0000022442177, y: 50}
|
m_AnchoredPosition: {x: 0.000011590219, y: 50}
|
||||||
m_SizeDelta: {x: 0, y: 100}
|
m_SizeDelta: {x: 0, y: 100}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!114 &455843809901100221
|
--- !u!114 &455843809901100221
|
||||||
|
@ -81391,7 +81391,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0.00000011920929, y: 0.74999994}
|
m_AnchoredPosition: {x: 0, y: 0.75}
|
||||||
m_SizeDelta: {x: -8, y: -6.5}
|
m_SizeDelta: {x: -8, y: -6.5}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5820556875347599956
|
--- !u!222 &5820556875347599956
|
||||||
|
@ -100891,6 +100891,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6788551056416428698}
|
- {fileID: 6788551056416428698}
|
||||||
|
- {fileID: 773915991517710749}
|
||||||
m_Father: {fileID: 8463856118875763708}
|
m_Father: {fileID: 8463856118875763708}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -126407,3 +126408,128 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1001 &6649204014538633504
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 7480441870429284241}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 6267664518521124994, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-fabao
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 100
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 100
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: be5fe01ae64af2e44a81c16cd8af411b, type: 3}
|
||||||
|
--- !u!224 &773915991517710749 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6649204014538633504}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
@ -690,7 +690,7 @@ RedPointType = {
|
||||||
DynamicAct = 2017,--破阵诛仙
|
DynamicAct = 2017,--破阵诛仙
|
||||||
DynamicActTask_MeiRi = 20169,--破阵诛仙每日任务
|
DynamicActTask_MeiRi = 20169,--破阵诛仙每日任务
|
||||||
DynamicActTask_MeiZhou = 20170,--破阵诛仙每周任务
|
DynamicActTask_MeiZhou = 20170,--破阵诛仙每周任务
|
||||||
DynamicActTask = 20171,--破阵诛仙任务
|
-- DynamicActTask = 20171,--破阵诛仙任务
|
||||||
DynamicActRecharge = 20172,--破阵诛仙累充
|
DynamicActRecharge = 20172,--破阵诛仙累充
|
||||||
WeekGiftPage = 2018, -- 每周礼包
|
WeekGiftPage = 2018, -- 每周礼包
|
||||||
MonthGiftPage = 2019, -- 每月礼包
|
MonthGiftPage = 2019, -- 每月礼包
|
||||||
|
|
|
@ -577,7 +577,7 @@ function this.RefreshActivityRedPoint()
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
||||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
-- CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||||
CheckRedPointStatus(RedPointType.chaofanrushengRed)
|
CheckRedPointStatus(RedPointType.chaofanrushengRed)
|
||||||
CheckRedPointStatus(RedPointType.jijin128)
|
CheckRedPointStatus(RedPointType.jijin128)
|
||||||
|
|
|
@ -154,7 +154,7 @@ function this.RefreshActivityRedPoint()
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
||||||
-- CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
-- CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
||||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
-- CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2552,6 +2552,9 @@ local effectList = {
|
||||||
BattleUtil.FinalDamageCountShield(nil,caster, target,damage)
|
BattleUtil.FinalDamageCountShield(nil,caster, target,damage)
|
||||||
local hp=floor(damage*f2)
|
local hp=floor(damage*f2)
|
||||||
local arr = RoleManager.NoOrder(function (r) return r.camp == caster.camp end,false,true)
|
local arr = RoleManager.NoOrder(function (r) return r.camp == caster.camp end,false,true)
|
||||||
|
if arr==nil or #arr==0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
BattleUtil.SortByHpFactor(arr,sort)
|
BattleUtil.SortByHpFactor(arr,sort)
|
||||||
BattleUtil.CalTreatNoCrit(caster, arr[1],hp,1,skill)
|
BattleUtil.CalTreatNoCrit(caster, arr[1],hp,1,skill)
|
||||||
|
|
||||||
|
|
|
@ -448,6 +448,7 @@ function BattleUtil.ChooseTarget(role, chooseId)
|
||||||
--LogError(aaa.position)
|
--LogError(aaa.position)
|
||||||
end
|
end
|
||||||
aaa.isRealDead=false
|
aaa.isRealDead=false
|
||||||
|
arr={}
|
||||||
table.insert(arr,aaa)
|
table.insert(arr,aaa)
|
||||||
-- return aaa
|
-- return aaa
|
||||||
end
|
end
|
||||||
|
@ -1073,6 +1074,9 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
|
||||||
end
|
end
|
||||||
|
|
||||||
function BattleUtil.CalTreat(castRole, targetRole, value, baseFactor,skill)
|
function BattleUtil.CalTreat(castRole, targetRole, value, baseFactor,skill)
|
||||||
|
if targetRole==nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
-- 灵兽无效
|
-- 灵兽无效
|
||||||
if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then
|
if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then
|
||||||
return
|
return
|
||||||
|
@ -1106,6 +1110,9 @@ end
|
||||||
|
|
||||||
--没有暴击得治疗
|
--没有暴击得治疗
|
||||||
function BattleUtil.CalTreatNoCrit(castRole, targetRole, value, baseFactor,skill)
|
function BattleUtil.CalTreatNoCrit(castRole, targetRole, value, baseFactor,skill)
|
||||||
|
if targetRole==nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
-- 灵兽无效
|
-- 灵兽无效
|
||||||
if targetRole==nil then
|
if targetRole==nil then
|
||||||
return
|
return
|
||||||
|
@ -1135,6 +1142,9 @@ end
|
||||||
|
|
||||||
|
|
||||||
function BattleUtil.FinalTreat(castRole, targetRole, value, baseFactor,skill)
|
function BattleUtil.FinalTreat(castRole, targetRole, value, baseFactor,skill)
|
||||||
|
if targetRole==nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
-- 灵兽无效
|
-- 灵兽无效
|
||||||
if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then
|
if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then
|
||||||
return
|
return
|
||||||
|
@ -1180,10 +1190,16 @@ end
|
||||||
|
|
||||||
|
|
||||||
function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamageFactor,addDamageFactor,skill)
|
function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamageFactor,addDamageFactor,skill)
|
||||||
|
if targetRole==nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
-- 灵兽无效
|
-- 灵兽无效
|
||||||
if targetRole.type == BattleUnitType.Monster then
|
if targetRole.type == BattleUnitType.Monster then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if addDamageFactor==nil then
|
||||||
|
addDamageFactor=1
|
||||||
|
end
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.DisposeRoleCtrl_noheal, castRole,targetRole)
|
BattleLogic.Event:DispatchEvent(BattleEventName.DisposeRoleCtrl_noheal, castRole,targetRole)
|
||||||
if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血
|
if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血
|
||||||
--禁疗并且没有死亡的单位显示血量+0 不走后面代码,防止触发后面的被动 by:王振兴 2021/1/27
|
--禁疗并且没有死亡的单位显示血量+0 不走后面代码,防止触发后面的被动 by:王振兴 2021/1/27
|
||||||
|
@ -1193,6 +1209,7 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
baseFactor = baseFactor or 1
|
baseFactor = baseFactor or 1
|
||||||
|
critDamageFactor = critDamageFactor or 1
|
||||||
local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp)
|
local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp)
|
||||||
local hp = targetRole:GetRoleData(RoleDataName.Hp)
|
local hp = targetRole:GetRoleData(RoleDataName.Hp)
|
||||||
|
|
||||||
|
@ -1204,9 +1221,11 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
|
||||||
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreatedFactor, treatFactorFunc, castRole)
|
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreatedFactor, treatFactorFunc, castRole)
|
||||||
|
|
||||||
local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性
|
local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性
|
||||||
|
if factor==0 then
|
||||||
|
factor=1
|
||||||
|
end
|
||||||
local factor2 = targetRole:GetRoleData(RoleDataName.CureFacter)
|
local factor2 = targetRole:GetRoleData(RoleDataName.CureFacter)
|
||||||
local baseTreat = BattleUtil.FP_Mul(value, baseFactor, factor, factor2,critDamageFactor,addDamageFactor)
|
local baseTreat = BattleUtil.FP_Mul(value, baseFactor, factor, factor2,critDamageFactor,addDamageFactor)
|
||||||
|
|
||||||
--加入被动效果
|
--加入被动效果
|
||||||
local cl = {}
|
local cl = {}
|
||||||
local function treatingFunc(v, ct)
|
local function treatingFunc(v, ct)
|
||||||
|
@ -1219,7 +1238,6 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
|
||||||
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreated, treatingFunc, castRole)
|
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreated, treatingFunc, castRole)
|
||||||
baseTreat = BattleUtil.CountChangeList(baseTreat, cl)
|
baseTreat = BattleUtil.CountChangeList(baseTreat, cl)
|
||||||
|
|
||||||
|
|
||||||
-- 取整
|
-- 取整
|
||||||
local baseTreat = floor(baseTreat + 0.5)
|
local baseTreat = floor(baseTreat + 0.5)
|
||||||
|
|
||||||
|
|
|
@ -7,162 +7,162 @@ local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||||
local _CurPageIndex =1
|
local _CurPageIndex =1
|
||||||
local orginLayer
|
local orginLayer
|
||||||
local tabs = {
|
local tabs = {
|
||||||
[1] = { --第二周 破阵诛仙
|
-- [1] = { --第二周 破阵诛仙
|
||||||
default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
-- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[2] = { --第三周 勇冠三军
|
-- [2] = { --第三周 勇冠三军
|
||||||
default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
-- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[3] = { --第四周 叱咤风云
|
-- [3] = { --第四周 叱咤风云
|
||||||
default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
-- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[4] = { --第五周 丹心碧血
|
-- [4] = { --第五周 丹心碧血
|
||||||
default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh",
|
-- default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[5] = { --第六周 势不可挡
|
-- [5] = { --第六周 势不可挡
|
||||||
default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
-- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[6] = { --第七周 勇往直前
|
-- [6] = { --第七周 勇往直前
|
||||||
default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
-- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[7] = { --第八周 运筹帷幄
|
-- [7] = { --第八周 运筹帷幄
|
||||||
default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
-- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[8] = { --第九周 移山倒海
|
-- [8] = { --第九周 移山倒海
|
||||||
default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
-- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[9] = { --第十周 玄机妙算
|
-- [9] = { --第十周 玄机妙算
|
||||||
default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh",
|
-- default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[10] = { --第十一周 降龙伏虎
|
-- [10] = { --第十一周 降龙伏虎
|
||||||
default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh",
|
-- default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[11] = { --第十二周 旗开得胜
|
-- [11] = { --第十二周 旗开得胜
|
||||||
default = "q_qikaidesheng_icon2_zh", lock = "q_qikaidesheng_icon2_zh", select = "q_qikaidesheng_icon1_zh",
|
-- default = "q_qikaidesheng_icon2_zh", lock = "q_qikaidesheng_icon2_zh", select = "q_qikaidesheng_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[12] = { --第十三周 变幻莫测
|
-- [12] = { --第十三周 变幻莫测
|
||||||
default = "b_bianhuanmoce_icon2_zh", lock = "b_bianhuanmoce_icon2_zh", select = "b_bianhuanmoce_icon1_zh",
|
-- default = "b_bianhuanmoce_icon2_zh", lock = "b_bianhuanmoce_icon2_zh", select = "b_bianhuanmoce_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[13] = { --第十四周 博文多识
|
-- [13] = { --第十四周 博文多识
|
||||||
default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh",
|
-- default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[14] = { --第十五周 天相几人
|
-- [14] = { --第十五周 天相几人
|
||||||
default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh",
|
-- default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[15] = { --第十六周 所向披靡
|
-- [15] = { --第十六周 所向披靡
|
||||||
default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh",
|
-- default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[16] = { --第十七周 狭路相逢
|
-- [16] = { --第十七周 狭路相逢
|
||||||
default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh",
|
-- default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[17] = { --第十八周 铜墙铁壁
|
-- [17] = { --第十八周 铜墙铁壁
|
||||||
default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh",
|
-- default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[18] = { --第二周 破阵诛仙
|
-- [18] = { --第二周 破阵诛仙
|
||||||
default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
-- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[19] = { --第三周 勇冠三军
|
-- [19] = { --第三周 勇冠三军
|
||||||
default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
-- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[20] = { --第四周 叱咤风云
|
-- [20] = { --第四周 叱咤风云
|
||||||
default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
-- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[21] = { --第五周 丹心碧血
|
-- [21] = { --第五周 丹心碧血
|
||||||
default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh",
|
-- default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[22] = { --第六周 势不可挡
|
-- [22] = { --第六周 势不可挡
|
||||||
default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
-- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[23] = { --第七周 勇往直前
|
-- [23] = { --第七周 勇往直前
|
||||||
default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
-- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[24] = { --第八周 运筹帷幄
|
-- [24] = { --第八周 运筹帷幄
|
||||||
default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
-- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[25] = { --第九周 移山倒海
|
-- [25] = { --第九周 移山倒海
|
||||||
default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
-- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[26] = { --第十周 玄机妙算
|
-- [26] = { --第十周 玄机妙算
|
||||||
default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh",
|
-- default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[27] = { --第十一周 降龙伏虎
|
-- [27] = { --第十一周 降龙伏虎
|
||||||
default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh",
|
-- default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[28] = { --第十四周 博闻强识
|
-- [28] = { --第十四周 博闻强识
|
||||||
default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh",
|
-- default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[29] = { --第十五周 天相几人
|
-- [29] = { --第十五周 天相几人
|
||||||
default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh",
|
-- default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[30] = { --第十六周 所向披靡
|
-- [30] = { --第十六周 所向披靡
|
||||||
default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh",
|
-- default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[31] = { --第十七周 狭路相逢
|
-- [31] = { --第十七周 狭路相逢
|
||||||
default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh",
|
-- default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[32] = { --第十八周 铜墙铁壁
|
-- [32] = { --第十八周 铜墙铁壁
|
||||||
default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh",
|
-- default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[33] = { --第二周 破阵诛仙
|
-- [33] = { --第二周 破阵诛仙
|
||||||
default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
-- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[34] = { --第三周 勇冠三军
|
-- [34] = { --第三周 勇冠三军
|
||||||
default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
-- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[35] = { --第四周 叱咤风云
|
-- [35] = { --第四周 叱咤风云
|
||||||
default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
-- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[36] = { --第六周 势不可挡
|
-- [36] = { --第六周 势不可挡
|
||||||
default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
-- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[37] = { --第七周 勇往直前
|
-- [37] = { --第七周 勇往直前
|
||||||
default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
-- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[38] = { --第八周 运筹帷幄
|
-- [38] = { --第八周 运筹帷幄
|
||||||
default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
-- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[39] = { --第九周 移山倒海
|
-- [39] = { --第九周 移山倒海
|
||||||
default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
-- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh",
|
||||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
-- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||||
},
|
-- },
|
||||||
[40] = { --社稷大典
|
[40] = { --社稷大典
|
||||||
default = "r_guanka_sheji_anniu_02_zh", lock = "r_guanka_sheji_anniu_02_zh", select = "r_guanka_sheji_anniu_01_zh",
|
default = "r_guanka_sheji_anniu_02_zh", lock = "r_guanka_sheji_anniu_02_zh", select = "r_guanka_sheji_anniu_01_zh",
|
||||||
rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration
|
rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration
|
||||||
|
|
|
@ -266,7 +266,8 @@ function this.SingleDataShow(pre,value)
|
||||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond)
|
NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
|
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
|
||||||
this.Refresh(false,false)
|
this.Refresh(false,false)
|
||||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
CheckRedPointStatus(RedPointType.DynamicActTask_MeiRi)
|
||||||
|
CheckRedPointStatus(RedPointType.DynamicActTask_MeiZhou)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
elseif state == 0 then
|
elseif state == 0 then
|
||||||
|
|
|
@ -502,7 +502,7 @@ function this.RegisterRedCheckFunc()
|
||||||
-- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
-- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
||||||
RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
|
-- RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
|
||||||
RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiRi, OperatingManager.CheckDynamicActTaskRed)
|
RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiRi, OperatingManager.CheckDynamicActTaskRed)
|
||||||
RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiZhou, OperatingManager.CheckDynamicActTaskRed)
|
RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiZhou, OperatingManager.CheckDynamicActTaskRed)
|
||||||
RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||||
|
|
|
@ -1155,7 +1155,7 @@ function this:SortEquipDatas(_equipDatas)
|
||||||
if a.isRedPointShow == b.isRedPointShow then
|
if a.isRedPointShow == b.isRedPointShow then
|
||||||
if a.itemConfig.Quantity == b.itemConfig.Quantity then
|
if a.itemConfig.Quantity == b.itemConfig.Quantity then
|
||||||
if equipConfig[a.id].Position == equipConfig[b.id].Position then
|
if equipConfig[a.id].Position == equipConfig[b.id].Position then
|
||||||
return a.id > b.id
|
return itemConfig[a.id].Sort > itemConfig[b.id].Sort
|
||||||
else
|
else
|
||||||
return equipConfig[a.id].Position < equipConfig[b.id].Position
|
return equipConfig[a.id].Position < equipConfig[b.id].Position
|
||||||
end
|
end
|
||||||
|
|
|
@ -186,6 +186,7 @@ function TailsManSouPanel:SetSingleData(go,data,index)
|
||||||
if not self.itemPreList[go] then
|
if not self.itemPreList[go] then
|
||||||
self.itemPreList[go] = {}
|
self.itemPreList[go] = {}
|
||||||
self.itemPreList[go].obj = Util.GetGameObject(go,"go")
|
self.itemPreList[go].obj = Util.GetGameObject(go,"go")
|
||||||
|
self.itemPreList[go].effect = Util.GetGameObject(self.itemPreList[go].obj,"ui-fabao")
|
||||||
self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
||||||
self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/tip"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/tip"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
||||||
self.itemPreList[go].mask1 = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/mask1"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
self.itemPreList[go].mask1 = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/mask1"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin
|
||||||
|
@ -217,6 +218,7 @@ function TailsManSouPanel:SetSingleData(go,data,index)
|
||||||
self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv
|
self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv
|
||||||
self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv
|
self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv
|
||||||
self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList))
|
self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList))
|
||||||
|
self.itemPreList[go].effect:SetActive(self.itemPreList[go].data.quality == 6)
|
||||||
|
|
||||||
for i = 1,math.max(#data.trumpList,#self.itemPreList[go].iconList) do
|
for i = 1,math.max(#data.trumpList,#self.itemPreList[go].iconList) do
|
||||||
if not data.trumpList[i] then
|
if not data.trumpList[i] then
|
||||||
|
@ -229,6 +231,7 @@ function TailsManSouPanel:SetSingleData(go,data,index)
|
||||||
self.itemPreList[go].iconList[i].effectjin.gameObject:SetActive(data.trumpList[i].config.Quality == 5)
|
self.itemPreList[go].iconList[i].effectjin.gameObject:SetActive(data.trumpList[i].config.Quality == 5)
|
||||||
end
|
end
|
||||||
Util.SetParticleSortLayer(go,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(go,self.sortingOrder + 1)
|
||||||
|
Util.SetParticleSortLayer(self.itemPreList[go].effect,self.sortingOrder + 1)
|
||||||
Util.AddOnceClick(go,function()
|
Util.AddOnceClick(go,function()
|
||||||
UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id)
|
UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id)
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in New Issue