Merge branch 'china/dev' into 0优化/界面优化
commit
9ac870db81
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e2adab77a8711b242846091751296096
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -13099,8 +13099,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3212244756701904239}
|
||||
- component: {fileID: 7051047519548440414}
|
||||
- component: {fileID: 4463008979964420397}
|
||||
- component: {fileID: 1876896852746920017}
|
||||
- component: {fileID: 6364469521312437198}
|
||||
m_Layer: 5
|
||||
m_Name: xiaoyaoBtn
|
||||
m_TagString: Untagged
|
||||
|
|
@ -13122,6 +13122,7 @@ RectTransform:
|
|||
- {fileID: 5921217385984459860}
|
||||
- {fileID: 3816437666150209794}
|
||||
- {fileID: 2075676431393585290}
|
||||
- {fileID: 9075856861972713303}
|
||||
m_Father: {fileID: 3847735914630897183}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -13138,35 +13139,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6495467815025581066}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4463008979964420397
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6495467815025581066}
|
||||
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: 0}
|
||||
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: 21300000, guid: adde8054810b2df47bc6ab95e01ccab7, type: 3}
|
||||
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!114 &1876896852746920017
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13203,12 +13175,32 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4463008979964420397}
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &6364469521312437198
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6495467815025581066}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
|
||||
--- !u!1 &6503000540594768807
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13519,6 +13511,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7173601102540005816
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9075856861972713303}
|
||||
- component: {fileID: 8011076288320213388}
|
||||
- component: {fileID: 8299314090036111732}
|
||||
m_Layer: 5
|
||||
m_Name: lock
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9075856861972713303
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7173601102540005816}
|
||||
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: []
|
||||
m_Father: {fileID: 3212244756701904239}
|
||||
m_RootOrder: 3
|
||||
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: 12.42, y: -5.4}
|
||||
m_SizeDelta: {x: 92, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8011076288320213388
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7173601102540005816}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8299314090036111732
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7173601102540005816}
|
||||
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: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3}
|
||||
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 &7193894844801949144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ RectTransform:
|
|||
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: -131}
|
||||
m_AnchoredPosition: {x: 0, y: -148}
|
||||
m_SizeDelta: {x: 827.3, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1016765218
|
||||
|
|
@ -72,7 +72,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
|
@ -425,8 +425,8 @@ RectTransform:
|
|||
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.0024674796, y: -29.9}
|
||||
m_SizeDelta: {x: 934.5, y: 741.5}
|
||||
m_AnchoredPosition: {x: -0.0024674796, y: -50.5}
|
||||
m_SizeDelta: {x: 934.5, y: 782.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6456508445828842645
|
||||
CanvasRenderer:
|
||||
|
|
@ -573,7 +573,7 @@ RectTransform:
|
|||
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: 7}
|
||||
m_AnchoredPosition: {x: 0, y: 24}
|
||||
m_SizeDelta: {x: 827.3, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2083990477332016980
|
||||
|
|
@ -611,7 +611,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
|
@ -731,7 +731,7 @@ RectTransform:
|
|||
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: -247.00005}
|
||||
m_AnchoredPosition: {x: 0, y: -309}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &204185013497269125
|
||||
|
|
@ -5831,8 +5831,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -70.935}
|
||||
m_SizeDelta: {x: -26, y: -448.67}
|
||||
m_AnchoredPosition: {x: 0, y: -93.79999}
|
||||
m_SizeDelta: {x: -26, y: -413.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5908738705246960078
|
||||
CanvasRenderer:
|
||||
|
|
@ -15527,7 +15527,7 @@ RectTransform:
|
|||
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: -332.00003}
|
||||
m_AnchoredPosition: {x: 0, y: -386}
|
||||
m_SizeDelta: {x: 260, y: 74}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1237362095978058062
|
||||
|
|
@ -20658,7 +20658,7 @@ RectTransform:
|
|||
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: -34.8, y: -247}
|
||||
m_AnchoredPosition: {x: -34.8, y: -308.99994}
|
||||
m_SizeDelta: {x: 70, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5612938726750989706
|
||||
|
|
|
|||
|
|
@ -56373,6 +56373,10 @@ MonoBehaviour:
|
|||
extension: .prefab
|
||||
resPathIndex: 637
|
||||
resAbNameIndex: 3138
|
||||
- resName: DemonSlayerNewPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 638
|
||||
resAbNameIndex: 3139
|
||||
- resName: DemonSlayerPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 638
|
||||
|
|
|
|||
|
|
@ -1000,7 +1000,9 @@ RedPointType = {
|
|||
YuJianXingTime = 8701,--次数
|
||||
YuJianXingRecord = 8702,--纪录
|
||||
--新百宝商会
|
||||
TreasureStoreSeason2 = 880--主城
|
||||
TreasureStoreSeason2 = 880,--主城
|
||||
--新三界降魔
|
||||
DemonSlayerNew = 890,--新三界降魔
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
|
@ -1278,6 +1280,7 @@ ActivityTypeDef = {
|
|||
slhjExper = 70,--森罗幻境达人
|
||||
AccumulativeRechargeExper = 24,--限时累计充值
|
||||
DemonSlayer = 25,--三界除魔
|
||||
DemonSlayerNew = 27,--新版三界除魔
|
||||
PatFace = 29,--神兵天降
|
||||
LuckyTurnTable_One=30,--幸运探宝
|
||||
LuckyTurnTable_Two=31,--高级探宝
|
||||
|
|
|
|||
|
|
@ -424,6 +424,7 @@ UIName = {
|
|||
CultivationPanel = 429,--主角修为界面
|
||||
TreasureStoreSeason2 = 431,--新百宝商会
|
||||
PracticeSkillInfoPanel = 430, --修行主角技能信息界面
|
||||
DemonSlayerNewPanel = 432, --新版三界降魔
|
||||
}
|
||||
|
||||
SubUIConfig = {
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ FIGHTUNITINFO_STAR_FIELD = protobuf.FieldDescriptor();
|
|||
FIGHTUNITINFO_SKINID_FIELD = protobuf.FieldDescriptor();
|
||||
FIGHTUNITINFO_REALID_FIELD = protobuf.FieldDescriptor();
|
||||
FIGHTUNITINFO_FORCESCORE_FIELD = protobuf.FieldDescriptor();
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD = protobuf.FieldDescriptor();
|
||||
FIGHTTEAMINFO = protobuf.Descriptor();
|
||||
FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor();
|
||||
FIGHTTEAMINFO_POKEMONUNITLIST_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -1660,11 +1661,21 @@ FIGHTUNITINFO_FORCESCORE_FIELD.default_value = 0
|
|||
FIGHTUNITINFO_FORCESCORE_FIELD.type = 3
|
||||
FIGHTUNITINFO_FORCESCORE_FIELD.cpp_type = 2
|
||||
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.name = "playerSex"
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.full_name = ".rpc.protocols.FightUnitInfo.playerSex"
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.number = 9
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.index = 8
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.label = 1
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.has_default_value = false
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.default_value = 0
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.type = 5
|
||||
FIGHTUNITINFO_PLAYERSEX_FIELD.cpp_type = 1
|
||||
|
||||
FIGHTUNITINFO.name = "FightUnitInfo"
|
||||
FIGHTUNITINFO.full_name = ".rpc.protocols.FightUnitInfo"
|
||||
FIGHTUNITINFO.nested_types = {}
|
||||
FIGHTUNITINFO.enum_types = {}
|
||||
FIGHTUNITINFO.fields = {FIGHTUNITINFO_UNITID_FIELD, FIGHTUNITINFO_UNITSKILLIDS_FIELD, FIGHTUNITINFO_PROPERTY_FIELD, FIGHTUNITINFO_POSITION_FIELD, FIGHTUNITINFO_STAR_FIELD, FIGHTUNITINFO_SKINID_FIELD, FIGHTUNITINFO_REALID_FIELD, FIGHTUNITINFO_FORCESCORE_FIELD}
|
||||
FIGHTUNITINFO.fields = {FIGHTUNITINFO_UNITID_FIELD, FIGHTUNITINFO_UNITSKILLIDS_FIELD, FIGHTUNITINFO_PROPERTY_FIELD, FIGHTUNITINFO_POSITION_FIELD, FIGHTUNITINFO_STAR_FIELD, FIGHTUNITINFO_SKINID_FIELD, FIGHTUNITINFO_REALID_FIELD, FIGHTUNITINFO_FORCESCORE_FIELD, FIGHTUNITINFO_PLAYERSEX_FIELD}
|
||||
FIGHTUNITINFO.is_extendable = false
|
||||
FIGHTUNITINFO.extensions = {}
|
||||
FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.name = "fightUnitList"
|
||||
|
|
|
|||
|
|
@ -265,11 +265,13 @@ end
|
|||
function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage)
|
||||
-- 基础数据
|
||||
--LogError("teamdamage=="..tonumber(pokemonUnit.forceScore))
|
||||
LogError("性别=="..tonumber(pokemonUnit.playerSex))
|
||||
local role = {
|
||||
id = tonumber(pokemonUnit.unitId),
|
||||
position = tonumber(pokemonUnit.position),
|
||||
star = tonumber(pokemonUnit.star),
|
||||
teamDamage = tonumber(pokemonUnit.forceScore),
|
||||
sex= tonumber(pokemonUnit.playerSex),
|
||||
camp = camp,
|
||||
skill = {},
|
||||
property = {},
|
||||
|
|
@ -654,7 +656,9 @@ function this.GetMonsterDataFromGroup(gId, camp)
|
|||
local mUnit = {
|
||||
unitId = id,
|
||||
position = i,
|
||||
star = star
|
||||
star = star,
|
||||
playerSex = 0,
|
||||
forceScore = 0
|
||||
}
|
||||
local pros = this.GetMonsterPros(id, level, star)
|
||||
mUnit.property = pros
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ function Monster:Init(data)
|
|||
self.uid= data.id
|
||||
self.teamDamage=data.teamDamage
|
||||
self.roleData = data
|
||||
self.sex=data.sex
|
||||
self.data:Init(self, data.property)
|
||||
self.buffFilter:Clear() --buff屏蔽列表
|
||||
self.Event:ClearEvent()
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
|
|||
heroTData.Scale = 0.6
|
||||
heroTData.Position = {127, -340}
|
||||
end
|
||||
heroTData.Name = NameManager.roleName
|
||||
heroTData.Name = PracticeManager.SetNameColor(NameManager.roleName, PracticeManager.PracticeLevel)
|
||||
end
|
||||
|
||||
this.liveName = heroTData.Live
|
||||
|
|
|
|||
|
|
@ -336,12 +336,12 @@ function this.HeadAdapter(head, data)
|
|||
local config = {}
|
||||
if data.position==100 then
|
||||
config.Quality=4
|
||||
if NameManager.roleSex==ROLE_SEX.BOY then
|
||||
if data.roleData.sex==ROLE_SEX.BOY then
|
||||
aa=3201
|
||||
else
|
||||
aa=3202
|
||||
end
|
||||
config.lv=PlayerManager.level
|
||||
config.lv=data.roleData.star
|
||||
star=0
|
||||
else
|
||||
if roleId > 10100 then
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ function MonsterView:onCreate(go, role, position, root)
|
|||
-- 获取数据
|
||||
local live=0
|
||||
if position==100 then
|
||||
if NameManager.roleSex==ROLE_SEX.BOY then
|
||||
if role.sex==ROLE_SEX.BOY then
|
||||
self.livePath="live2d_npc_boy"
|
||||
else
|
||||
self.livePath="live2d_npc_girl"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,283 @@
|
|||
require("Base/BasePanel")
|
||||
local DemonSlayerNewPanel = Inherit(BasePanel)
|
||||
local this = DemonSlayerNewPanel
|
||||
local sortingOrder = 0
|
||||
local actRankConfig = ConfigManager.GetConfig(ConfigName.ActivityRankingReward)
|
||||
local itemsGrid = {}--item重复利用
|
||||
local state = 0
|
||||
|
||||
local allRankData,myRankData
|
||||
local npcList={}
|
||||
|
||||
local btnState={
|
||||
[1] = {Img = "s_slbz_1anniuhuangse",Text = "前 往"},
|
||||
[2] = {Img = "s_slbz_1anniuongse",Text = "领 取"},
|
||||
[3] = {Img = "s_slbz_1anniuhuise",Text = "已领取"},
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function DemonSlayerNewPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.btnBack = Util.GetGameObject(self.gameObject,"BackBtn")
|
||||
this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn")
|
||||
this.btnRank = Util.GetGameObject(self.gameObject,"RankList")
|
||||
|
||||
this.timeText = Util.GetGameObject(self.gameObject, "rewardContent/time"):GetComponent("Text")
|
||||
this.pos = Util.GetGameObject(self.gameObject, "pos")
|
||||
|
||||
this.textNum = Util.GetGameObject(self.gameObject, "rewardContent/textNum")
|
||||
this.tips = Util.GetGameObject(self.textNum, "Tips")
|
||||
this.obj = Util.GetGameObject(self.textNum, "Obj")
|
||||
this.nextLevel = Util.GetGameObject(self.obj, "num"):GetComponent("Text")
|
||||
|
||||
this.itemPre = Util.GetGameObject(self.gameObject, "rewardContent/reward/itemPre")
|
||||
this.scrollItem = Util.GetGameObject(self.gameObject, "rewardContent/reward/grid")
|
||||
local rootHight = this.scrollItem.transform.rect.height
|
||||
local width = this.scrollItem.transform.rect.width
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
||||
this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
this.ScrollView.elastic = false
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function DemonSlayerNewPanel:BindEvent()
|
||||
Util.AddClick(this.btnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.helpBtn, function()
|
||||
local pos = this.helpBtn.transform.localPosition
|
||||
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.DemonSlayer, pos.x, pos.y)
|
||||
end)
|
||||
Util.AddClick(this.btnRank, function()
|
||||
if state == 0 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[4])
|
||||
elseif state == 1 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[11])
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function DemonSlayerNewPanel:AddListener()
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function DemonSlayerNewPanel:RemoveListener()
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function DemonSlayerNewPanel:OnOpen()
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function DemonSlayerNewPanel:OnShow()
|
||||
DemonSlayerNewPanel:Refresh(false)
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:Refresh(isAnim)
|
||||
local ActInfo = CommonActPageManager.GetData(ActivityTypeDef.DemonSlayerNew)
|
||||
CheckRedPointStatus(RedPointType.DemonSlayerNew)
|
||||
this.ActId = ActInfo.activityId
|
||||
DemonSlayerNewPanel:SetState(ActInfo)
|
||||
DemonSlayerNewPanel:SetRank(ActInfo)
|
||||
DemonSlayerNewPanel:OnShowData(ActInfo,isAnim)
|
||||
DemonSlayerNewPanel:SetTime(ActInfo)
|
||||
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:SetRank(ActInfo)
|
||||
if state == 0 then
|
||||
RankingManager.InitData(RANK_TYPE.MONSTER_RANK,function ()
|
||||
allRankData,myRankData = RankingManager.GetRankingInfo()
|
||||
for i = 1, 3 do
|
||||
local item = Util.GetGameObject(this.pos,"pos"..i.."/name"):GetComponent("Text")
|
||||
item.text = Language[10423]
|
||||
end
|
||||
|
||||
end)
|
||||
elseif state == 1 then
|
||||
RankingManager.InitData(RANK_TYPE.GOLD_EXPER,function ()
|
||||
allRankData,myRankData = RankingManager.GetRankingInfo()
|
||||
for i = 1, 3 do
|
||||
local item = Util.GetGameObject(this.pos,"pos"..i.."/name"):GetComponent("Text")
|
||||
local image = Util.GetGameObject(this.pos,"pos"..i.."/ren"):GetComponent("Image")
|
||||
local livePrefab = Util.GetGameObject(this.pos,"pos"..i.."/ren")
|
||||
|
||||
if allRankData[i] then
|
||||
image.enabled = false
|
||||
item.text = allRankData[i].userName
|
||||
|
||||
if npcList[i] then
|
||||
npcList[i]:OnClose()
|
||||
end
|
||||
local curPlayerLiveViewData = {
|
||||
skin = allRankData[i].userSkin,
|
||||
ride = allRankData[i].userMount,
|
||||
sex = allRankData[i].sex,
|
||||
designation = allRankData[i].userTitle
|
||||
}
|
||||
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
|
||||
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT)
|
||||
else
|
||||
image.enabled = true
|
||||
item.text = Language[10423]
|
||||
end
|
||||
end
|
||||
|
||||
end,ActInfo.activityId)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:SetState(ActInfo)
|
||||
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
|
||||
local time1 = ActInfo.endTime - GetTimeStamp()
|
||||
state = time1 - extraTime > 0 and 0 or 1
|
||||
this.textNum:SetActive(state == 0)
|
||||
if state == 0 then
|
||||
local num = 0
|
||||
for i = 1, #ActInfo.rewards do
|
||||
num = ActInfo.rewards[i].otherData.Values[1][2] - ActInfo.rewards[i].progress
|
||||
if num > 0 then
|
||||
this.nextLevel.text = num
|
||||
break
|
||||
end
|
||||
end
|
||||
this.tips:SetActive(num <= 0)
|
||||
this.obj:SetActive(num > 0)
|
||||
end
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:OnShowData(ActInfo,isAnim)
|
||||
this.ScrollView:SetData(ActInfo.rewards, function (index, go)
|
||||
DemonSlayerNewPanel:SingleDataShow(go, ActInfo.rewards[index],index)
|
||||
end,nil,isAnim)
|
||||
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:SingleDataShow(pre,data,index)
|
||||
local btnGet = Util.GetGameObject(pre,"Button"):GetComponent("Image")
|
||||
local btnText = Util.GetGameObject(btnGet.gameObject,"Text"):GetComponent("Text")
|
||||
local level = Util.GetGameObject(pre,"Text"):GetComponent("Text")
|
||||
local rewards = Util.GetGameObject(pre,"rewards")
|
||||
local shows = data.otherData.Reward
|
||||
|
||||
level.text = string.format("%s层",data.otherData.Values[1][2])
|
||||
btnGet.sprite = this.spLoader:LoadSprite(btnState[data.otherData.State].Img)
|
||||
btnText.text = btnState[data.otherData.State].Text
|
||||
--滚动条复用重设itemview
|
||||
if itemsGrid[pre] then
|
||||
for i = 1, 5 do
|
||||
itemsGrid[pre][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #shows do
|
||||
if itemsGrid[pre][i] then
|
||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
|
||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
else
|
||||
itemsGrid[pre]={}
|
||||
for i = 1, 5 do
|
||||
itemsGrid[pre][i] = SubUIManager.Open(SubUIConfig.ItemView, rewards.transform)
|
||||
itemsGrid[pre][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #shows do
|
||||
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.8,false,false,false,self.sortingOrder)
|
||||
itemsGrid[pre][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
||||
Util.AddOnceClick(btnGet.gameObject,function ()
|
||||
if data.otherData.State == 1 then
|
||||
JumpManager.GoJump(1011)
|
||||
elseif data.otherData.State == 2 then
|
||||
NetManager.GetActivityRewardRequest(data.missionId,this.ActId,function (drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function ()
|
||||
this:Refresh(true)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
function DemonSlayerNewPanel:SetTime(ActInfo)
|
||||
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
|
||||
--设置一进去的时间,不设置的话一进去会不对
|
||||
local time = ActInfo.endTime - GetTimeStamp() - extraTime
|
||||
local timeStr = ""
|
||||
if time > 0 then
|
||||
timeStr = "距活动结束:%s"
|
||||
else
|
||||
timeStr = "距活动关闭:%s"
|
||||
end
|
||||
if time > 3600 then
|
||||
this.timeText.text = string.format(timeStr,TimeToDHM(time))
|
||||
else
|
||||
this.timeText.text = string.format(timeStr,TimeToMS(time))
|
||||
end
|
||||
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
--计时器
|
||||
self.timer = Timer.New(function ()
|
||||
if state == 0 then
|
||||
local time = ActInfo.endTime - GetTimeStamp() - extraTime
|
||||
if time > 3600 then
|
||||
this.timeText.text = string.format(timeStr,TimeToDHM(time))
|
||||
else
|
||||
this.timeText.text = string.format(timeStr,TimeToMS(time))
|
||||
end
|
||||
time = time -1
|
||||
if time <= 0 then
|
||||
DemonSlayerNewPanel:Refresh()
|
||||
end
|
||||
elseif state == 1 then
|
||||
local time = ActInfo.endTime - GetTimeStamp()
|
||||
if time > 3600 then
|
||||
this.timeText.text = string.format(timeStr,TimeToDHM(time))
|
||||
else
|
||||
this.timeText.text = string.format(timeStr,TimeToMS(time))
|
||||
end
|
||||
time = time -1
|
||||
if time <= 0 then
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end,1,-1,true)
|
||||
self.timer:Start()
|
||||
end
|
||||
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function DemonSlayerNewPanel:OnClose()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
for i = 1, #npcList do
|
||||
npcList[i]:OnClose()
|
||||
end
|
||||
sortingOrder = 0
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function DemonSlayerNewPanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
sortingOrder = 0
|
||||
end
|
||||
|
||||
return DemonSlayerNewPanel
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e7f69b2cf8d69f44b9fadc9fb83654af
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -9,9 +9,6 @@ local state = 0
|
|||
|
||||
local isPlayAnim = true
|
||||
local allRankData,myRankData
|
||||
|
||||
-- local mapNpc = "live2d_npc_map"
|
||||
-- local mapNpc2 = "live2d_npc_map_nv"
|
||||
local npcList={}
|
||||
|
||||
local rankImage={
|
||||
|
|
@ -39,7 +36,7 @@ function DemonSlayerPanel:InitComponent()
|
|||
this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
|
||||
this.ScrollView.elastic = false
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -69,14 +66,6 @@ end
|
|||
function DemonSlayerPanel:RemoveListener()
|
||||
end
|
||||
|
||||
-- function DemonSlayerPanel:OnSortingOrderChange()
|
||||
-- for i, v in pairs(itemsGrid) do
|
||||
-- for j = 1, #itemsGrid[i] do
|
||||
-- itemsGrid[i][j]:SetEffectLayer()
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function DemonSlayerPanel:OnOpen()
|
||||
end
|
||||
|
|
@ -127,20 +116,11 @@ function DemonSlayerPanel:SetRank(ActInfo)
|
|||
local item = Util.GetGameObject(this.pos,"pos"..i.."/name"):GetComponent("Text")
|
||||
local image = Util.GetGameObject(this.pos,"pos"..i.."/ren"):GetComponent("Image")
|
||||
local livePrefab = Util.GetGameObject(this.pos,"pos"..i.."/ren")
|
||||
local npc,scale
|
||||
|
||||
if allRankData[i] then
|
||||
image.enabled = false
|
||||
item.text = allRankData[i].userName
|
||||
|
||||
--加载立绘
|
||||
-- npc = allRankData[i].sex == ROLE_SEX.BOY and mapNpc or mapNpc2
|
||||
-- local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.25
|
||||
-- npcList[i] = poolManager:LoadLive(npc, livePrefab.transform, scale, Vector3.New(0,-158.31,0))
|
||||
-- local SkeletonGraphic = npcList[i]:GetComponent("SkeletonGraphic")
|
||||
-- if SkeletonGraphic then
|
||||
-- SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
-- end
|
||||
if npcList[i] then
|
||||
npcList[i]:OnClose()
|
||||
end
|
||||
|
|
@ -166,17 +146,7 @@ end
|
|||
function DemonSlayerPanel:SetState(ActInfo)
|
||||
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
|
||||
local time1 = ActInfo.endTime - GetTimeStamp()
|
||||
-- if time1 > 0 then
|
||||
if time1 - extraTime > 0 then
|
||||
state = 0--7天内
|
||||
else
|
||||
state = 1--2天内
|
||||
end
|
||||
-- else
|
||||
-- self:ClosePanel()
|
||||
-- PopupTipPanel.ShowTip("活动已结束!")
|
||||
-- end
|
||||
|
||||
state = time1 - extraTime > 0 and 0 or 1
|
||||
end
|
||||
|
||||
function DemonSlayerPanel:OnShowData(ActInfo)
|
||||
|
|
@ -219,14 +189,6 @@ function DemonSlayerPanel:SingleDataShow(pre,data,index)
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
local activityRewardGo = pre
|
||||
-- if isPlayAnim then
|
||||
-- activityRewardGo:SetActive(false)
|
||||
-- else
|
||||
-- activityRewardGo:SetActive(true)
|
||||
-- end
|
||||
|
||||
--滚动条复用重设itemview
|
||||
if itemsGrid[pre] then
|
||||
for i = 1, 5 do
|
||||
|
|
@ -298,7 +260,6 @@ function DemonSlayerPanel:SetTime(ActInfo)
|
|||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
-- DemonSlayerPanel:Refresh()
|
||||
end
|
||||
end
|
||||
end,1,-1,true)
|
||||
|
|
@ -313,8 +274,6 @@ function DemonSlayerPanel:OnClose()
|
|||
self.timer = nil
|
||||
end
|
||||
for i = 1, #npcList do
|
||||
-- poolManager:UnLoadLive(npcList[i].gameObject.name, npcList[i])
|
||||
-- npcList[i]=nil
|
||||
npcList[i]:OnClose()
|
||||
end
|
||||
sortingOrder = 0
|
||||
|
|
|
|||
|
|
@ -56,8 +56,11 @@ function LikeAbilityPanel:InitComponent()
|
|||
|
||||
--逍遥游入口
|
||||
self.btnXiaoYao=Util.GetGameObject(self.gameObject,"xiaoyaoBtn")
|
||||
self.btnXiaoYao:GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiaoyaoyou_daanniu_zh")
|
||||
self.btnXiaoYaoLock=Util.GetGameObject(self.btnXiaoYao,"lock")
|
||||
self.btnXiaoYaoIcon=Util.GetGameObject(self.btnXiaoYao,"Image")
|
||||
self.btnXiaoYaoIcon:GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiaoyaoyou_daanniu_zh")
|
||||
self.xiaoyaoRedPoint=Util.GetGameObject(self.btnXiaoYao,"redPoint")
|
||||
self.btnXiaoYaoTextPar = Util.GetGameObject(self.btnXiaoYao,"curValue")
|
||||
self.btnXiaoYaoText = Util.GetGameObject(self.btnXiaoYao,"curValue/num"):GetComponent("Text")
|
||||
end
|
||||
|
||||
|
|
@ -85,7 +88,12 @@ function LikeAbilityPanel:BindEvent()
|
|||
end)
|
||||
--逍遥游
|
||||
Util.AddClick(self.btnXiaoYao,function()
|
||||
XiaoYaoManager.OpenMapList()
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.XiaoYaoYou) then
|
||||
XiaoYaoManager.OpenMapList()
|
||||
else
|
||||
local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.XiaoYaoYou)
|
||||
PopupTipPanel.ShowTip(tip)
|
||||
end
|
||||
end)
|
||||
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, self.xiaoyaoRedPoint)
|
||||
end
|
||||
|
|
@ -122,6 +130,17 @@ function LikeAbilityPanel:OnShow()
|
|||
Util.SetParticleSortLayer(self.effect1,self.sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(self.effect2,self.sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(self.effect3,self.sortingOrder + 1)
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.XiaoYaoYou) then
|
||||
Util.SetGray(self.btnXiaoYaoIcon.gameObject,true)
|
||||
self.xiaoyaoRedPoint.gameObject:SetActive(false)
|
||||
self.btnXiaoYaoTextPar.gameObject:SetActive(false)
|
||||
self.btnXiaoYaoLock.gameObject:SetActive(true)
|
||||
else
|
||||
Util.SetGray(self.btnXiaoYaoIcon.gameObject,false)
|
||||
self.xiaoyaoRedPoint.gameObject:SetActive(true)
|
||||
self.btnXiaoYaoTextPar.gameObject:SetActive(true)
|
||||
self.btnXiaoYaoLock.gameObject:SetActive(false)
|
||||
end
|
||||
self.btnXiaoYaoText.text=string.format("%d/%d",BagManager.GetItemCountById(UpViewRechargeType.YunYouVle),PrivilegeManager.GetPrivilegeNumber(39))
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1014,6 +1014,8 @@ function this:TabBtnAction(id,actType,data)
|
|||
UIManager.OpenPanel(UIName.PrayMainPanel)
|
||||
elseif id == ActivityTypeDef.DemonSlayer then
|
||||
UIManager.OpenPanel(UIName.DemonSlayerPanel)
|
||||
elseif id == ActivityTypeDef.DemonSlayerNew then
|
||||
UIManager.OpenPanel(UIName.DemonSlayerNewPanel)
|
||||
elseif id == ActivityTypeDef.TreasureOfSomeBody then
|
||||
UIManager.OpenPanel(UIName.MissionDailyPanel,2,1)
|
||||
elseif id == ActivityTypeDef.TreasureStore then
|
||||
|
|
|
|||
|
|
@ -252,6 +252,37 @@ local TypeUpdateFunc = {
|
|||
end)
|
||||
end
|
||||
end,
|
||||
[ActivityTypeDef.DemonSlayerNew] = function ()--新三界降魔
|
||||
local curData = dataList[ActivityTypeDef.DemonSlayerNew]
|
||||
local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curData.activityId)
|
||||
for i = 1, #curData.rewards do
|
||||
for j = 1, #configData do
|
||||
if curData.rewards[i].missionId == configData[j].Id then
|
||||
curData.rewards[i].otherData.Values = configData[j].Values
|
||||
curData.rewards[i].otherData.Reward = configData[j].Reward
|
||||
curData.rewards[i].otherData.Sort = configData[j].Sort
|
||||
curData.rewards[i].otherData.State = 0
|
||||
if curData.rewards[i].state == 0 then
|
||||
if curData.rewards[i].otherData.Values[1][2] <= curData.rewards[i].progress then
|
||||
curData.rewards[i].otherData.State = 2--可领取
|
||||
else
|
||||
curData.rewards[i].otherData.State = 1--未达成
|
||||
end
|
||||
elseif curData.rewards[i].state == 1 then
|
||||
curData.rewards[i].otherData.State = 3--已经领取
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
table.sort(curData.rewards,function (a,b)
|
||||
if a.state == b.state then
|
||||
return a.otherData.Sort < b.otherData.Sort
|
||||
else
|
||||
return a.state < b.state
|
||||
end
|
||||
end)
|
||||
end
|
||||
}
|
||||
|
||||
--超凡入圣
|
||||
|
|
@ -541,4 +572,17 @@ function this.CheckSingleRed(data)
|
|||
return false
|
||||
end
|
||||
|
||||
--新三界降魔红点检测
|
||||
function this.DemonSlayerNewRedCheck()
|
||||
local data = this.GetData(ActivityTypeDef.DemonSlayerNew)
|
||||
if data then
|
||||
for i = 1, #data.rewards do
|
||||
if data.rewards[i].otherData.State == 2 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
return CommonActPageManager
|
||||
|
|
@ -103,6 +103,8 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.OrdinaryExplore, RedPointType.ExploreMain)--大闹天宫
|
||||
RPData:SetParent(RedPointType.HeroExplore, RedPointType.ExploreMain)--日常副本
|
||||
RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain)--心魔试炼
|
||||
RPData:SetParent(RedPointType.FightLevel, RedPointType.ExploreMain)--山河社稷图
|
||||
|
||||
RPData:SetParent(RedPointType.LegendExplore, RedPointType.Guild)--车迟斗法
|
||||
RPData:SetParent(RedPointType.HeartDemon,RedPointType.EpicExplore)
|
||||
RPData:SetParent(RedPointType.PersonTrail,RedPointType.EpicExplore)
|
||||
|
|
@ -165,7 +167,7 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.DailyTask, RedPointType.DailyTaskMain)
|
||||
RPData:SetParent(RedPointType.QinglongSerectTreasure, RedPointType.DailyTaskMain)
|
||||
RPData:SetParent(RedPointType.QinglongSerectTreasureTrail, RedPointType.DailyTaskMain)
|
||||
RPData:SetParent(RedPointType.FightLevel, RedPointType.SecretTer)
|
||||
-- RPData:SetParent(RedPointType.FightLevel, RedPointType.SecretTer)
|
||||
RPData:SetParent(RedPointType.JourneyWithWind, RedPointType.SecretTer)
|
||||
-- RPData:SetParent(RedPointType.QinglongSerectTreasure, RedPointType.TreasureOfSl)
|
||||
-- RPData:SetParent(RedPointType.QinglongSerectTreasureTrail, RedPointType.TreasureOfSl)
|
||||
|
|
@ -598,6 +600,8 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.playerSkill2, PracticeManager.CheckPlayerSkillRed)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill3, PracticeManager.CheckPlayerSkillRed)
|
||||
RPData:AddCheckFunc(RedPointType.playerSkill4, PracticeManager.CheckPlayerSkillRed)
|
||||
--三界降魔
|
||||
RPData:AddCheckFunc(RedPointType.DemonSlayerNew, CommonActPageManager.DemonSlayerNewRedCheck)
|
||||
end
|
||||
|
||||
-- 向红点绑定物体
|
||||
|
|
|
|||
|
|
@ -23,6 +23,14 @@ function this.Initialize()
|
|||
this.treasureActiveList = {}
|
||||
this.InitTreasureData()
|
||||
this.battleResult = {}
|
||||
|
||||
-- 特权刷新时,刷新红点
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeUpdate, function(PrivilegeId)
|
||||
if PrivilegeId == 3201 then
|
||||
-- 检测七界试炼红点
|
||||
CheckRedPointStatus(RedPointType.QiJieShiLian)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function this.InitTreasureData()
|
||||
|
|
|
|||
Loading…
Reference in New Issue