【限时神装】增加拍脸

dev_chengFeng
ZhangBiao 2021-01-18 16:20:42 +08:00
parent d7f4ad06ba
commit 20fd353f51
4 changed files with 104 additions and 27 deletions

View File

@ -4826,7 +4826,7 @@ ParticleSystem:
--- !u!199 &388424564176726122 --- !u!199 &388424564176726122
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -9591,7 +9591,7 @@ ParticleSystem:
--- !u!199 &5642469893068164604 --- !u!199 &5642469893068164604
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -15035,7 +15035,7 @@ ParticleSystem:
--- !u!199 &6980591947779102396 --- !u!199 &6980591947779102396
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -20037,7 +20037,7 @@ ParticleSystem:
--- !u!199 &4701465730525705860 --- !u!199 &4701465730525705860
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -25498,7 +25498,7 @@ ParticleSystem:
--- !u!199 &3001069433479247941 --- !u!199 &3001069433479247941
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -30432,7 +30432,7 @@ ParticleSystem:
--- !u!199 &6613047145366089846 --- !u!199 &6613047145366089846
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -35163,7 +35163,7 @@ ParticleSystem:
--- !u!199 &9217841000470942024 --- !u!199 &9217841000470942024
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -35507,6 +35507,7 @@ RectTransform:
- {fileID: 8660291478372360394} - {fileID: 8660291478372360394}
- {fileID: 844531762} - {fileID: 844531762}
- {fileID: 8686516956908852922} - {fileID: 8686516956908852922}
- {fileID: 8886546230790821216}
m_Father: {fileID: 7544816490905136625} m_Father: {fileID: 7544816490905136625}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -40218,7 +40219,7 @@ ParticleSystem:
--- !u!199 &2124577974979890954 --- !u!199 &2124577974979890954
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -44981,7 +44982,7 @@ ParticleSystem:
--- !u!199 &5106740060054464023 --- !u!199 &5106740060054464023
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -49795,7 +49796,7 @@ ParticleSystem:
--- !u!199 &8960199070391989490 --- !u!199 &8960199070391989490
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -54590,7 +54591,7 @@ ParticleSystem:
--- !u!199 &7359216366102305690 --- !u!199 &7359216366102305690
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -59288,7 +59289,7 @@ ParticleSystem:
--- !u!199 &7460618575120098998 --- !u!199 &7460618575120098998
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -60009,6 +60010,61 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!1 &3794051866806008573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8886546230790821216}
- component: {fileID: 5405977648433105224}
m_Layer: 5
m_Name: obg8
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8886546230790821216
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3794051866806008573}
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: 556506645228767928}
m_RootOrder: 7
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.000000023283064, y: -5.820766e-11}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &5405977648433105224
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3794051866806008573}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3830188716025405346 --- !u!1 &3830188716025405346
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -64896,7 +64952,7 @@ ParticleSystem:
--- !u!199 &5111161841675474879 --- !u!199 &5111161841675474879
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -69760,7 +69816,7 @@ ParticleSystem:
--- !u!199 &5806130462228726497 --- !u!199 &5806130462228726497
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -75342,7 +75398,7 @@ ParticleSystem:
--- !u!199 &7373368277435315207 --- !u!199 &7373368277435315207
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -80422,7 +80478,7 @@ ParticleSystem:
--- !u!199 &3709671069954902721 --- !u!199 &3709671069954902721
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -85276,7 +85332,7 @@ ParticleSystem:
--- !u!199 &3660410566839083555 --- !u!199 &3660410566839083555
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -90140,7 +90196,7 @@ ParticleSystem:
--- !u!199 &1457848531720553357 --- !u!199 &1457848531720553357
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -95028,7 +95084,7 @@ ParticleSystem:
--- !u!199 &224327521925811566 --- !u!199 &224327521925811566
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -99726,7 +99782,7 @@ ParticleSystem:
--- !u!199 &3696278493355588457 --- !u!199 &3696278493355588457
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -104946,7 +105002,7 @@ ParticleSystem:
--- !u!199 &198135863771870846 --- !u!199 &198135863771870846
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -109884,7 +109940,7 @@ ParticleSystem:
--- !u!199 &2614583688631146448 --- !u!199 &2614583688631146448
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -114921,7 +114977,7 @@ ParticleSystem:
--- !u!199 &4563214009284254638 --- !u!199 &4563214009284254638
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -119853,7 +119909,7 @@ ParticleSystem:
--- !u!199 &3725158868941333592 --- !u!199 &3725158868941333592
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -125140,7 +125196,7 @@ ParticleSystem:
--- !u!199 &535359238822102199 --- !u!199 &535359238822102199
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -130799,7 +130855,7 @@ ParticleSystem:
--- !u!199 &6493140793722168007 --- !u!199 &6493140793722168007
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 2 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View File

@ -1990,6 +1990,7 @@ FacePanelType = {
UpgradePac = 8,--升级限时礼包 UpgradePac = 8,--升级限时礼包
MonsterWave = 9,--心魔试炼限时礼包 MonsterWave = 9,--心魔试炼限时礼包
MainLevel = 10,--主线限时礼包 MainLevel = 10,--主线限时礼包
TimeLimitSkin = 11,--限时神装礼包
} }
--迷宫寻宝条件类型 --迷宫寻宝条件类型
FindTreasureNeedType = { FindTreasureNeedType = {

View File

@ -214,6 +214,19 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
table.insert(patFaceAllData,v) table.insert(patFaceAllData,v)
end end
end end
elseif v.Type == 11 then--限时神装礼包
local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,106).Value
local num = tonumber(specialConfig)
local canGet = false
local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId
if PlayerManager.level == num then
canGet =true
end
if canGet then
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
table.insert(patFaceAllData,v)
end
end
else else
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
table.insert(patFaceAllData,v) table.insert(patFaceAllData,v)

View File

@ -72,6 +72,8 @@ function PatFacePanel:InitComponent()
self.tipImage=Util.GetGameObject(self.transform,"frame/obg6/activityTextIcon/Image"):GetComponent("Image") self.tipImage=Util.GetGameObject(self.transform,"frame/obg6/activityTextIcon/Image"):GetComponent("Image")
--升级限时礼包 --升级限时礼包
self.obg7 = Util.GetGameObject(self.transform, "frame/obg7") self.obg7 = Util.GetGameObject(self.transform, "frame/obg7")
--限时神装礼包
self.obg8 = Util.GetGameObject(self.transform, "frame/obg8")
end end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)
@ -147,7 +149,7 @@ function PatFacePanel:OnShowPatFaceData()
patFaceSingleData.Type == FacePanelType.MonsterWave or patFaceSingleData.Type == FacePanelType.MonsterWave or
patFaceSingleData.Type == FacePanelType.MainLevel then patFaceSingleData.Type == FacePanelType.MainLevel then
self:OnShowOb7Data(patFaceSingleData.Type) self:OnShowOb7Data(patFaceSingleData.Type)
elseif patFaceSingleData.Type == FacePanelType.GrowGift then elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then
self:OnShowOb8Data() self:OnShowOb8Data()
end end
end end
@ -343,6 +345,11 @@ function PatFacePanel:OnShowOb7Data(Type)
UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end)
end end
--第八种 限时神装礼包
function PatFacePanel:OnShowOb8Data()
UIManager.OpenPanel(UIName.TimeLimitSkinPanel,function() self:ClosePanel() end)
end
function PatFacePanel:JumpBtnClickEvent() function PatFacePanel:JumpBtnClickEvent()
if openPanle then if openPanle then
openPanle.patFaceCallList:Clear() openPanle.patFaceCallList:Clear()