【特惠神装】提交

dev_chengFeng
ZhangBiao 2021-06-30 14:39:31 +08:00
parent 04d4f6a5c3
commit eeee396c3a
3 changed files with 64 additions and 2 deletions

View File

@ -35509,6 +35509,7 @@ RectTransform:
- {fileID: 8686516956908852922}
- {fileID: 8886546230790821216}
- {fileID: 4751487582385847768}
- {fileID: 3413082925205827094}
m_Father: {fileID: 7544816490905136625}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -131343,6 +131344,61 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &9076066729908135207
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3413082925205827094}
- component: {fileID: 657805705425805715}
m_Layer: 5
m_Name: obg10
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3413082925205827094
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9076066729908135207}
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: 9
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 &657805705425805715
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9076066729908135207}
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 &9081771348126344217
GameObject:
m_ObjectHideFlags: 0

View File

@ -389,7 +389,8 @@ UIName = {
CongratulationPopup = 396,--通用恭喜界面(类似恭喜升级)
MonsterCampNewPanel = 398,--心魔试炼新界面
AttriTips = 399,--属性弹窗
SurpriseBoxPanel = 401,--惊喜礼盒
SurpriseBoxPanel = 401, --惊喜礼盒
TeHuiShenZhuang = 402, --特惠神装
}
SubUIConfig = {

View File

@ -244,11 +244,16 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
table.insert(patFaceAllData,v)
end
end
elseif v.Type == 12 then--惊喜礼盒活动
elseif v.Type == 14 then--惊喜礼盒活动
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SurpriseBox)
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."SurpriseBoxPatFaceDay"..ActData.value) == 0 then
table.insert(patFaceAllData,v)
end
elseif v.Type == 15 then--特惠神装活动
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TeHuiShenZhuang)
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activiteId) == 0 then
table.insert(patFaceAllData,v)
end
else
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
table.insert(patFaceAllData,v)