至尊降世修改提交
parent
b811bd0d24
commit
1ae167efb5
|
@ -93326,17 +93326,16 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2610085912055831642}
|
m_GameObject: {fileID: 2610085912055831642}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children: []
|
||||||
- {fileID: 8864781858333978289}
|
|
||||||
m_Father: {fileID: 7587722306364218479}
|
m_Father: {fileID: 7587722306364218479}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 1.2000008, y: -123.49997}
|
m_AnchoredPosition: {x: 1.2000008, y: -146}
|
||||||
m_SizeDelta: {x: 139.1, y: 85}
|
m_SizeDelta: {x: 139.1, y: 85}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7517416439544057648
|
--- !u!222 &7517416439544057648
|
||||||
|
@ -114700,86 +114699,6 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!1 &5085205516297028270
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 8864781858333978289}
|
|
||||||
- component: {fileID: 4156776195768309956}
|
|
||||||
- component: {fileID: 7250120399227246419}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Text
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 0
|
|
||||||
--- !u!224 &8864781858333978289
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5085205516297028270}
|
|
||||||
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: 288159487902255827}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 0.80000305, y: 2.3999996}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &4156776195768309956
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5085205516297028270}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &7250120399227246419
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5085205516297028270}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0, g: 1, b: 0, a: 1}
|
|
||||||
m_RaycastTarget: 0
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
|
||||||
m_FontSize: 30
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 2
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: "\u5DF2\u9886\u53D6"
|
|
||||||
LanguageIndex: 0
|
|
||||||
--- !u!1 &5087045731407517034
|
--- !u!1 &5087045731407517034
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -115592,86 +115511,6 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u524D\u5F80\u5145\u503C"
|
m_Text: "\u524D\u5F80\u5145\u503C"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &6368216005349462929
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 6902245447893221461}
|
|
||||||
- component: {fileID: 1267119458515401879}
|
|
||||||
- component: {fileID: 1012474592677202171}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Text
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 0
|
|
||||||
--- !u!224 &6902245447893221461
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6368216005349462929}
|
|
||||||
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: 3200740663725197731}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 0.80000305, y: 2.3999996}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &1267119458515401879
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6368216005349462929}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &1012474592677202171
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6368216005349462929}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0, g: 1, b: 0, a: 1}
|
|
||||||
m_RaycastTarget: 0
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
|
||||||
m_FontSize: 30
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 2
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: "\u5DF2\u6FC0\u6D3B"
|
|
||||||
LanguageIndex: 0
|
|
||||||
--- !u!1 &6583779903045673334
|
--- !u!1 &6583779903045673334
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -116268,86 +116107,6 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u524D\u5F80\u5145\u503C"
|
m_Text: "\u524D\u5F80\u5145\u503C"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &7738716185832366853
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 462808752675699689}
|
|
||||||
- component: {fileID: 469023020658185389}
|
|
||||||
- component: {fileID: 3320440921661179701}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Text
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 0
|
|
||||||
--- !u!224 &462808752675699689
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7738716185832366853}
|
|
||||||
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: 4482919580259737999}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: 0.80000305, y: 2.3999996}
|
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &469023020658185389
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7738716185832366853}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &3320440921661179701
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7738716185832366853}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 0, g: 1, b: 0, a: 1}
|
|
||||||
m_RaycastTarget: 0
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
|
||||||
m_FontData:
|
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
|
||||||
m_FontSize: 30
|
|
||||||
m_FontStyle: 0
|
|
||||||
m_BestFit: 0
|
|
||||||
m_MinSize: 2
|
|
||||||
m_MaxSize: 40
|
|
||||||
m_Alignment: 4
|
|
||||||
m_AlignByGeometry: 0
|
|
||||||
m_RichText: 1
|
|
||||||
m_HorizontalOverflow: 0
|
|
||||||
m_VerticalOverflow: 0
|
|
||||||
m_LineSpacing: 1
|
|
||||||
m_Text: "\u5DF2\u6FC0\u6D3B"
|
|
||||||
LanguageIndex: 0
|
|
||||||
--- !u!1 &7779675472010025042
|
--- !u!1 &7779675472010025042
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -116573,17 +116332,16 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8193321407615057279}
|
m_GameObject: {fileID: 8193321407615057279}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children: []
|
||||||
- {fileID: 462808752675699689}
|
|
||||||
m_Father: {fileID: 3297505370134903317}
|
m_Father: {fileID: 3297505370134903317}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 1.2000008, y: -123.49997}
|
m_AnchoredPosition: {x: 1.2000008, y: -146}
|
||||||
m_SizeDelta: {x: 139.1, y: 85}
|
m_SizeDelta: {x: 139.1, y: 85}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &564122449516624801
|
--- !u!222 &564122449516624801
|
||||||
|
@ -117481,17 +117239,16 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8937040338509014150}
|
m_GameObject: {fileID: 8937040338509014150}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children: []
|
||||||
- {fileID: 6902245447893221461}
|
|
||||||
m_Father: {fileID: 5401945702704876126}
|
m_Father: {fileID: 5401945702704876126}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 1.2000008, y: -123.49997}
|
m_AnchoredPosition: {x: 1.2000008, y: -146}
|
||||||
m_SizeDelta: {x: 139.1, y: 85}
|
m_SizeDelta: {x: 139.1, y: 85}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3334048645510034510
|
--- !u!222 &3334048645510034510
|
||||||
|
|
|
@ -966,10 +966,11 @@ function this.CheckSupremeHeroRedPoint()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
isGetBigReward = false
|
||||||
for k,v in ipairs(actInfo.mission) do
|
for k,v in ipairs(actInfo.mission) do
|
||||||
local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,v.missionId)
|
local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,v.missionId)
|
||||||
if v.state == 1 or (v.state == 0 and v.progress < config.Values[1][1]) then
|
if v.state == 0 and v.progress >= config.Values[1][1] and v.missionId ~= 4209 then
|
||||||
return false
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1396,6 +1397,8 @@ function this.CheckSupremeMission(indexType,isHaveBigReward)
|
||||||
return isAllGet
|
return isAllGet
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--新百宝商会红点检测
|
--新百宝商会红点检测
|
||||||
function this.TreasureStoreSeason2RedCheck()
|
function this.TreasureStoreSeason2RedCheck()
|
||||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureStoreSeason2) then
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureStoreSeason2) then
|
||||||
|
|
|
@ -1370,7 +1370,7 @@ function this.TimeFormat()
|
||||||
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||||
if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
|
if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
|
||||||
if v.ActiveType == 42 then
|
if v.ActiveType == 42 then
|
||||||
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then
|
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
|
||||||
showTab = false
|
showTab = false
|
||||||
else
|
else
|
||||||
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
||||||
|
@ -1627,7 +1627,7 @@ function this.RefreshActivityShow()
|
||||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||||
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
|
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
|
||||||
if v.ActiveType == 42 then
|
if v.ActiveType == 42 then
|
||||||
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then
|
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
|
||||||
showTab = false
|
showTab = false
|
||||||
else
|
else
|
||||||
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
||||||
|
|
|
@ -421,7 +421,7 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
elseif JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi then
|
elseif JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi then
|
||||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
|
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
|
||||||
if id and id > 0 then
|
if id and id > 0 then
|
||||||
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then
|
if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) and ActivityGiftManager.CheckSupremeMission(3,true) then
|
||||||
isShow = false
|
isShow = false
|
||||||
else
|
else
|
||||||
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require("Base/BasePanel")
|
require("Base/BasePanel")
|
||||||
SupremeHeroPopup = Inherit(BasePanel)
|
SupremeHeroPopupNew = Inherit(BasePanel)
|
||||||
local this=SupremeHeroPopup
|
local this=SupremeHeroPopupNew
|
||||||
local artResConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
local artResConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||||
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||||
local activityConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
local activityConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||||
|
@ -17,25 +17,25 @@ local idList = {
|
||||||
panelId = 1,
|
panelId = 1,
|
||||||
wenziId = 1,
|
wenziId = 1,
|
||||||
btnTip = Language[11530].."<color=#F4D98A>%s</color>",
|
btnTip = Language[11530].."<color=#F4D98A>%s</color>",
|
||||||
[1] = {id = 4201},
|
[1] = {id = 4201,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[2] = {id = 4202},
|
[2] = {id = 4202,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[3] = {id = 4203},
|
[3] = {id = 4203,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
panelId = 1,
|
panelId = 1,
|
||||||
wenziId = 2,
|
wenziId = 2,
|
||||||
btnTip = Language[10317],
|
btnTip = Language[10317],
|
||||||
[1] = {id = 4204},
|
[1] = {id = 4204,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[2] = {id = 4205},
|
[2] = {id = 4205,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[3] = {id = 4206},
|
[3] = {id = 4206,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||||
},
|
},
|
||||||
[3] = {
|
[3] = {
|
||||||
panelId = 2,
|
panelId = 2,
|
||||||
wenziId = 3,
|
wenziId = 3,
|
||||||
btnTip = Language[10317],
|
btnTip = Language[10317],
|
||||||
[1] = {id = 4207},
|
[1] = {id = 4207,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[2] = {id = 4208},
|
[2] = {id = 4208,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||||
[3] = {id = 4209},
|
[3] = {id = 4209,state1 = "前往充值",state2 = "点击购买",state3 = "s_slbz_yilingqu_zh"},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ local lastPage = 0
|
||||||
local isFrist = false
|
local isFrist = false
|
||||||
---剑影迷踪
|
---剑影迷踪
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function SupremeHeroPopup:InitComponent()
|
function SupremeHeroPopupNew:InitComponent()
|
||||||
this.spLoader = SpriteLoader.New()
|
this.spLoader = SpriteLoader.New()
|
||||||
orginLayer = 0
|
orginLayer = 0
|
||||||
orginLayer2 = 0
|
orginLayer2 = 0
|
||||||
|
@ -74,9 +74,10 @@ function SupremeHeroPopup:InitComponent()
|
||||||
this.RewardList[i].go = Util.GetGameObject(this.middle, "Reward/Panel".. i)
|
this.RewardList[i].go = Util.GetGameObject(this.middle, "Reward/Panel".. i)
|
||||||
this.RewardList[i].title = Util.GetGameObject(this.RewardList[i].go, "Image/Title"):GetComponent("Text")
|
this.RewardList[i].title = Util.GetGameObject(this.RewardList[i].go, "Image/Title"):GetComponent("Text")
|
||||||
this.RewardList[i].Btn = Util.GetGameObject(this.RewardList[i].go, "Button")
|
this.RewardList[i].Btn = Util.GetGameObject(this.RewardList[i].go, "Button")
|
||||||
this.RewardList[i].BtnTip = Util.GetGameObject(this.RewardList[i].Btn, "Text"):GetComponent("Text")
|
this.RewardList[i].btnTip = Util.GetGameObject(this.RewardList[i].Btn, "Text"):GetComponent("Text")
|
||||||
this.RewardList[i].btnGet = Util.GetGameObject(this.RewardList[i].go, "BtnGet")
|
this.RewardList[i].btnGet = Util.GetGameObject(this.RewardList[i].go, "BtnGet")
|
||||||
this.RewardList[i].doneImg = Util.GetGameObject(this.RewardList[i].go, "BtnDone")
|
this.RewardList[i].btnGetTip = Util.GetGameObject(this.RewardList[i].btnGet, "Text"):GetComponent("Text")
|
||||||
|
this.RewardList[i].doneImg = Util.GetGameObject(this.RewardList[i].go, "BtnDone"):GetComponent("Image")
|
||||||
this.RewardList[i].frame = Util.GetGameObject(this.RewardList[i].go, "frame")
|
this.RewardList[i].frame = Util.GetGameObject(this.RewardList[i].go, "frame")
|
||||||
this.RewardList[i].red = Util.GetGameObject(this.RewardList[i].btnGet, "redPot")
|
this.RewardList[i].red = Util.GetGameObject(this.RewardList[i].btnGet, "redPot")
|
||||||
end
|
end
|
||||||
|
@ -137,7 +138,7 @@ function this.LoadLive2D()
|
||||||
this.proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName))
|
this.proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[heroId].PropertyName))
|
||||||
end
|
end
|
||||||
|
|
||||||
function SupremeHeroPopup:OnSortingOrderChange()
|
function SupremeHeroPopupNew:OnSortingOrderChange()
|
||||||
local layer = self.sortingOrder
|
local layer = self.sortingOrder
|
||||||
Util.SetParticleSortLayer(this.effectRoot3, layer + 1)
|
Util.SetParticleSortLayer(this.effectRoot3, layer + 1)
|
||||||
Util.SetParticleSortLayer(this.effectRoot5, layer + 1)
|
Util.SetParticleSortLayer(this.effectRoot5, layer + 1)
|
||||||
|
@ -153,7 +154,7 @@ function SupremeHeroPopup:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function SupremeHeroPopup:BindEvent()
|
function SupremeHeroPopupNew:BindEvent()
|
||||||
--返回按钮
|
--返回按钮
|
||||||
Util.AddClick(this.backBtn,function()
|
Util.AddClick(this.backBtn,function()
|
||||||
if not canClose then return end
|
if not canClose then return end
|
||||||
|
@ -194,25 +195,25 @@ function SupremeHeroPopup:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
function SupremeHeroPopup:AddListener()
|
function SupremeHeroPopupNew:AddListener()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function SupremeHeroPopup:RemoveListener()
|
function SupremeHeroPopupNew:RemoveListener()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
local fun = nil
|
local fun = nil
|
||||||
function SupremeHeroPopup:OnOpen(_fun)
|
function SupremeHeroPopupNew:OnOpen(_fun)
|
||||||
Timer.New(function ()
|
Timer.New(function ()
|
||||||
SoundManager.PlaySound(SoundConfig.UI_Hd_yhdd)
|
SoundManager.PlaySound(SoundConfig.UI_Hd_yhdd)
|
||||||
end,0.5):Start()
|
end,0.5):Start()
|
||||||
fun = _fun
|
fun = _fun
|
||||||
end
|
end
|
||||||
|
|
||||||
function SupremeHeroPopup:OnShow()
|
function SupremeHeroPopupNew:OnShow()
|
||||||
for i = 1,#this.panelist do
|
for i = 1,#this.panelist do
|
||||||
for k,v in pairs(this.panelist[i]) do
|
for k,v in pairs(this.panelist[i]) do
|
||||||
if (i == 1 or i == 2) and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
if (i == 1 or i == 2) and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||||
|
@ -358,15 +359,22 @@ function this.SetMissionData()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(this.RewardList[j].btnGet,function()
|
Util.AddOnceClick(this.RewardList[j].btnGet,function()
|
||||||
NetManager.GetActivityRewardRequest(idList[curPage][j].id, actData.activityId,function(drop)
|
if curPage == 3 and j == 3 then
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
JumpManager.GoJump(36012)
|
||||||
actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear)
|
||||||
this.RefreshItemData(j,idList[curPage][j].id)
|
this:ClosePanel()
|
||||||
this.SetButtonState()
|
else
|
||||||
this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1))
|
NetManager.GetActivityRewardRequest(idList[curPage][j].id, actData.activityId,function(drop)
|
||||||
this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2))
|
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||||
|
actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||||
|
this.RefreshItemData(j,idList[curPage][j].id)
|
||||||
|
this.SetButtonState()
|
||||||
|
this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(2))
|
||||||
|
this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(3))
|
||||||
|
this.oneTabRed.gameObject:SetActive(this.RefreshRedPoint(1))
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -380,11 +388,22 @@ function this.SetMissionData()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.RefreshItemData(index,missionId)
|
function this.RefreshItemData(index,missionId)
|
||||||
|
this.RewardList[index].doneImg.gameObject:SetActive(false)
|
||||||
|
this.RewardList[index].Btn.gameObject:SetActive(false)
|
||||||
|
this.RewardList[index].btnGet.gameObject:SetActive(false)
|
||||||
for i = 1,#actData.mission do
|
for i = 1,#actData.mission do
|
||||||
if actData.mission[i].missionId == missionId then
|
if actData.mission[i].missionId == missionId then
|
||||||
this.RewardList[index].doneImg.gameObject:SetActive(actData.mission[i].state == 1)
|
if actData.mission[i].state == 1 then
|
||||||
this.RewardList[index].Btn.gameObject:SetActive(actData.mission[i].state == 0 and this.money < activityConfig[missionId].Values[1][1])
|
this.RewardList[index].doneImg.gameObject:SetActive(true)
|
||||||
this.RewardList[index].btnGet.gameObject:SetActive(actData.mission[i].state == 0 and this.money >= activityConfig[missionId].Values[1][1])
|
this.RewardList[index].doneImg.sprite = this.spLoader:LoadSprite(idList[curPage][index].state3)
|
||||||
|
elseif this.money < activityConfig[missionId].Values[1][1] then
|
||||||
|
this.RewardList[index].Btn.gameObject:SetActive(true)
|
||||||
|
this.RewardList[index].btnTip.text = idList[curPage][index].state1
|
||||||
|
else
|
||||||
|
this.RewardList[index].btnGet.gameObject:SetActive(true)
|
||||||
|
LogGreen("curPage:"..curPage.." index:"..index.." missionId:"..missionId)
|
||||||
|
this.RewardList[index].btnGetTip.text = idList[curPage][index].state2
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -407,7 +426,7 @@ function this.RefreshRedPoint(indexType)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function SupremeHeroPopup:OnClose()
|
function SupremeHeroPopupNew:OnClose()
|
||||||
if this.timer then
|
if this.timer then
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer = nil
|
this.timer = nil
|
||||||
|
@ -439,10 +458,10 @@ function SupremeHeroPopup:OnClose()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function SupremeHeroPopup:OnDestroy()
|
function SupremeHeroPopupNew:OnDestroy()
|
||||||
this.spLoader:Destroy()
|
this.spLoader:Destroy()
|
||||||
this.RewardList = {}
|
this.RewardList = {}
|
||||||
this.panelist = {}
|
this.panelist = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
return SupremeHeroPopup
|
return SupremeHeroPopupNew
|
Loading…
Reference in New Issue