Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.luadev_chengFeng
commit
2612c2e01e
|
@ -260,7 +260,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!223 &269973437117146302
|
||||
Canvas:
|
||||
|
@ -3003,9 +3003,9 @@ RectTransform:
|
|||
m_Father: {fileID: 9179711840133666567}
|
||||
m_RootOrder: 5
|
||||
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: -155.85, y: -193}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 390, y: -193}
|
||||
m_SizeDelta: {x: 768.3, y: 146.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4939929771722818741
|
||||
|
@ -3124,8 +3124,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: 65.2, y: 0.000015259}
|
||||
m_SizeDelta: {x: 422.1, y: 146.9}
|
||||
m_AnchoredPosition: {x: 77.5, y: 0.000015259}
|
||||
m_SizeDelta: {x: 397.4, y: 146.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8724425877200325181
|
||||
CanvasRenderer:
|
||||
|
@ -3152,7 +3152,7 @@ MonoBehaviour:
|
|||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
|
@ -5515,9 +5515,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8082431718913310779}
|
||||
m_RootOrder: 0
|
||||
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: -244.3, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 139.7, y: 0}
|
||||
m_SizeDelta: {x: 196.9, y: 125.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2437786908383537040
|
||||
|
@ -5555,7 +5555,7 @@ MonoBehaviour:
|
|||
m_BestFit: 1
|
||||
m_MinSize: 20
|
||||
m_MaxSize: 45
|
||||
m_Alignment: 4
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
|
@ -5760,15 +5760,25 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -5780,20 +5790,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
|
@ -5920,15 +5920,25 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -5940,20 +5950,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
|
@ -6080,15 +6080,25 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6100,20 +6110,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
|
@ -6240,30 +6240,15 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6275,15 +6260,30 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6416,30 +6416,15 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6451,15 +6436,30 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6592,15 +6592,25 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
|
@ -6612,20 +6622,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 3.2600002
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
|
|
|
@ -945,7 +945,7 @@ RedPointType = {
|
|||
jijin328 = 79,
|
||||
chaozhijijin = 80,
|
||||
|
||||
|
||||
linglongBaojing = 671,
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
|
|
@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent()
|
|||
PopupTipPanel.ShowTip(Language[11305])
|
||||
return
|
||||
end
|
||||
if GameObject.Find("LingLongBaoJingPanel") and GameObject.Find("LingLongBaoJingPanel").activeSelf then--掉落界面打开时,关闭掉落界面
|
||||
return
|
||||
end
|
||||
if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面
|
||||
UIManager.ClosePanel(UIName.RewardItemPopup, false)
|
||||
end
|
||||
|
|
|
@ -540,6 +540,8 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.jijin328,ActivityGiftManager.CheckRedpointUpperMonthCard)
|
||||
--寻宝迷踪
|
||||
RPData:AddCheckFunc(RedPointType.XunBaoMiZong,DynamicActivityManager.XunBaoMiZongRedCheck)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -110,8 +110,10 @@ end
|
|||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function DropGetSSRHeroShopPanel:OnClose()
|
||||
|
||||
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
|
||||
if testLiveGO then
|
||||
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
|
||||
testLiveGO = nil
|
||||
end
|
||||
if callBack then
|
||||
callBack()
|
||||
end
|
||||
|
|
|
@ -623,7 +623,8 @@ function this.ShowHeroEquip()
|
|||
lvObj:SetActive(false)
|
||||
end
|
||||
if curEquipTreasureDatas[i].refineLv > 0 then
|
||||
refineObj:GetComponent("Text").text = "+" .. curEquipTreasureDatas[i].refineLv
|
||||
|
||||
refineObj:GetComponent("Text").text = curEquipTreasureDatas[i].refineLv
|
||||
refineObj:SetActive(true)
|
||||
else
|
||||
refineObj:SetActive(false)
|
||||
|
@ -841,7 +842,7 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
else
|
||||
lvObj.gameObject:SetActive(false)
|
||||
end
|
||||
refineObj.text = "+" .. _itemData.refineLv
|
||||
refineObj.text = _itemData.refineLv
|
||||
if _itemData.refineLv > 0 then
|
||||
refineObj.gameObject:SetActive(true)
|
||||
else
|
||||
|
|
|
@ -5,14 +5,17 @@ local rewardList = {}
|
|||
--初始化
|
||||
function this.Initialize()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.RefreshData)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold,function()CheckRedPointStatus(RedPointType.linglongBaojing)end)
|
||||
end
|
||||
|
||||
function this.RefreshData()
|
||||
this.CheckRedPointLingLong()
|
||||
this.InitData(nil)
|
||||
end
|
||||
|
||||
function this.InitData(func)
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing)
|
||||
LogGreen("id:"..tostring(id))
|
||||
if not id or id < 1 then
|
||||
hitList = {}
|
||||
rewardList = {}
|
||||
|
@ -23,12 +26,15 @@ function this.InitData(func)
|
|||
end
|
||||
this.InitDataList(id)
|
||||
NetManager.QiMenDunJiaHitListRequest(id,function(msg)
|
||||
--sLogGreen("msg.hitList:"..#msg.hitList)
|
||||
-- for i = 1,#msg.hitList do
|
||||
-- LogGreen("msg.hitList:"..msg.hitList[i])
|
||||
-- end
|
||||
hitList = msg.hitList
|
||||
this.SetDataListState(hitList)
|
||||
if not msg.hitList or #msg.hitList < 1 then
|
||||
else
|
||||
LogGreen("msg.hitList:"..#msg.hitList)
|
||||
for i = 1,#msg.hitList do
|
||||
LogGreen("msg.hitList:"..msg.hitList[i])
|
||||
end
|
||||
this.SetDataListState(hitList)
|
||||
end
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
|
@ -36,6 +42,7 @@ function this.InitData(func)
|
|||
end
|
||||
|
||||
function this.InitDataList(id)
|
||||
rewardList = {}
|
||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.LingLongPool,"ActivityId",id)
|
||||
if configs then
|
||||
for i = 1 ,#configs do
|
||||
|
@ -61,7 +68,9 @@ end
|
|||
function this.SetDataListState(list,typeIndex)
|
||||
if list and #list > 0 then
|
||||
for i = 1,#list do
|
||||
rewardList[list[i]].state = 1
|
||||
if rewardList[list[i]] then
|
||||
rewardList[list[i]].state = 1
|
||||
end
|
||||
end
|
||||
else
|
||||
for k,v in pairs(rewardList) do
|
||||
|
@ -94,4 +103,19 @@ function this.QiMenDunJiaDrawRequest(id,func)
|
|||
end)
|
||||
end
|
||||
|
||||
function this.CheckRedPointLingLong()
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing)
|
||||
if not id or id < 1 then
|
||||
return false
|
||||
end
|
||||
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117)
|
||||
local strs = string.split(config.Value,"|")
|
||||
local costId = tonumber(strs[1])
|
||||
LogGreen("BagManager.GetItemCountById(costId):"..BagManager.GetItemCountById(costId))
|
||||
if BagManager.GetItemCountById(costId) > 0 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
return this
|
|
@ -17,6 +17,8 @@ end
|
|||
|
||||
local a,b,c,d
|
||||
local configs
|
||||
local isClose = false
|
||||
local drop = nil
|
||||
---初始化组件(用于子类重写)
|
||||
function LingLongBaoJingPanel:InitComponent(gameObject)
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
@ -124,70 +126,93 @@ function LingLongBaoJingPanel:BindEvent()
|
|||
PopupTipPanel.ShowTip("道具不足")
|
||||
return
|
||||
end
|
||||
LingLongBaoJingManager.QiMenDunJiaDrawRequest(self.actId,function(idList,drop)
|
||||
LingLongBaoJingManager.QiMenDunJiaDrawRequest(self.actId,function(idList,_drop)
|
||||
if not idList[1] then
|
||||
PopupTipPanel.ShowTip("转盘奖励出错了")
|
||||
return
|
||||
end
|
||||
end
|
||||
drop = _drop
|
||||
CheckRedPointStatus(RedPointType.linglongBaojing)
|
||||
self:DelayMaskWithBool(true)
|
||||
self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002)
|
||||
-- local drop = {}
|
||||
-- drop.itemlist = {}
|
||||
-- local idList = {1,1}
|
||||
LingLongBaoJingManager.SetDataListState(idList)
|
||||
local isAllGet = false
|
||||
if idList[2] and idList[2] > 0 then
|
||||
if LingLongBaoJingManager.IsAllGet() then
|
||||
isAllGet = true
|
||||
LingLongBaoJingManager.SetDataListState(nil,1)
|
||||
end
|
||||
LingLongBaoJingManager.SetDataListState(nil,2)
|
||||
end
|
||||
local x = function(isGetBigReward)
|
||||
LingLongBaoJingManager.SetDataListState(idList)
|
||||
local tempData = {}
|
||||
for i = 1,#idList do
|
||||
table.insert(tempData,data[idList[i]])
|
||||
end
|
||||
self:RefreshTreasureTypeState(0,tempData)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
if isGetBigReward then
|
||||
if LingLongBaoJingManager.IsAllGet() then
|
||||
LingLongBaoJingManager.SetDataListState(nil,1)
|
||||
self:RefreshTreasureTypeState(1)
|
||||
if drop then
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
drop = nil
|
||||
if isGetBigReward then
|
||||
if isAllGet then
|
||||
self:RefreshTreasureTypeState(1)
|
||||
end
|
||||
self:RefreshTreasureTypeState(2)
|
||||
if not isClose then
|
||||
self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false)
|
||||
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
||||
end
|
||||
else
|
||||
if not isClose then
|
||||
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
self:SetPropShow()
|
||||
self.fx_linglongbaojing_kaiqi.gameObject:SetActive(false)
|
||||
if not isClose then
|
||||
self.itemList[2][1].effect.gameObject:SetActive(false)
|
||||
end
|
||||
LingLongBaoJingManager.SetDataListState(nil,2)
|
||||
self:RefreshTreasureTypeState(2)
|
||||
self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false)
|
||||
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
||||
else
|
||||
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
||||
end
|
||||
self:SetPropShow()
|
||||
self.fx_linglongbaojing_kaiqi.gameObject:SetActive(false)
|
||||
self.itemList[2][1].effect.gameObject:SetActive(false)
|
||||
self.fx_linglongbaojing_longchuxian.gameObject:SetActive(false)
|
||||
for i = 1,#self.itemList[1] do
|
||||
self.itemList[1][i].effect.gameObject:SetActive(false)
|
||||
end
|
||||
self:DelayMaskWithBool(false)
|
||||
end)
|
||||
self.fx_linglongbaojing_longchuxian.gameObject:SetActive(false)
|
||||
for i = 1,#self.itemList[1] do
|
||||
if not isClose then
|
||||
self.itemList[1][i].effect.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
self:DelayMaskWithBool(false)
|
||||
end)
|
||||
end
|
||||
end
|
||||
curTurnPos = 1
|
||||
self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function()
|
||||
if idList[2] and idList[2] > 0 then
|
||||
--PopupTipPanel.ShowTip("播放一些开门的特效")
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004)
|
||||
self.Btncoroutine = coroutine.start(function()
|
||||
self.itemList[2][1].effect.gameObject:SetActive(true)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longsaoguang_006)
|
||||
coroutine.wait(1)
|
||||
self.fx_linglongbaojing_longchuxian.gameObject:SetActive(true)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longpanxuan_005)
|
||||
coroutine.wait(1)
|
||||
self:RefreshTreasureMaskByType(1,false)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquandianliang_008)
|
||||
for i = 1,#self.itemList[1] do
|
||||
self.itemList[1][i].effect.gameObject:SetActive(true)
|
||||
end
|
||||
coroutine.wait(1)
|
||||
curTurnPos = 1
|
||||
self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function()
|
||||
self:RefreshTreasureMaskByType(1,true)
|
||||
x(true)
|
||||
end)
|
||||
self.Btncoroutine = coroutine.start(function()
|
||||
local isStartWai = false
|
||||
while(not isClose and not isStartWai) do
|
||||
self.itemList[2][1].effect.gameObject:SetActive(true)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longsaoguang_006)
|
||||
coroutine.wait(1)
|
||||
self.fx_linglongbaojing_longchuxian.gameObject:SetActive(true)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longpanxuan_005)
|
||||
coroutine.wait(1)
|
||||
self:RefreshTreasureMaskByType(1,false)
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquandianliang_008)
|
||||
for i = 1,#self.itemList[1] do
|
||||
self.itemList[1][i].effect.gameObject:SetActive(true)
|
||||
end
|
||||
--coroutine.wait(0.5)
|
||||
isStartWai = true
|
||||
end
|
||||
while(not isClose and isStartWai) do
|
||||
isStartWai = false
|
||||
curTurnPos = 1
|
||||
self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function()
|
||||
self:RefreshTreasureMaskByType(1,true)
|
||||
x(true)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
else
|
||||
x(false)
|
||||
|
@ -221,6 +246,7 @@ end
|
|||
|
||||
-- 打开,重新打开时回调
|
||||
function LingLongBaoJingPanel:OnShow(_sortingOrder)
|
||||
isClose = false
|
||||
--self.parent.tabbox.gameObject:SetActive(false)
|
||||
self.gameObject:SetActive(true)
|
||||
self.sortingOrder = _sortingOrder
|
||||
|
@ -291,7 +317,7 @@ function LingLongBaoJingPanel:SetTime()
|
|||
remainTime = remainTime - 1
|
||||
self.time.text = "活动倒计时:"..TimeToDHMS(remainTime)
|
||||
if remainTime <= 0 then
|
||||
self:ClosePanel()
|
||||
self.time.text = "活动倒计时:"..TimeToDHMS(0)
|
||||
end
|
||||
end,1,-1,false)
|
||||
self.timer:Start()
|
||||
|
@ -307,7 +333,7 @@ function LingLongBaoJingPanel:RefreshTreasureType()
|
|||
end
|
||||
if config.ItemType ~= ItemType.Hero and config.ItemType ~= ItemType.linglongbaojingkaimen then
|
||||
self.itemList[v.typeIndex][v.address].numDi.gameObject:SetActive(true)
|
||||
self.itemList[v.typeIndex][v.address].num.text = v.reward[2]
|
||||
self.itemList[v.typeIndex][v.address].num.text = PrintWanNum(v.reward[2])
|
||||
else
|
||||
self.itemList[v.typeIndex][v.address].numDi.gameObject:SetActive(false)
|
||||
end
|
||||
|
@ -337,7 +363,7 @@ function LingLongBaoJingPanel:RefreshTreasureTypeState(typeIndex,_data)
|
|||
tempData = data
|
||||
end
|
||||
for k,v in pairs(tempData) do
|
||||
if (v.typeIndex == typeIndex) or typeIndex == 0 then
|
||||
if ((v.typeIndex == typeIndex) or typeIndex == 0) and not isClose then
|
||||
if v.state == 0 then
|
||||
self.itemList[v.typeIndex][v.address].get.gameObject:SetActive(false)
|
||||
else
|
||||
|
@ -349,7 +375,7 @@ end
|
|||
--外圈遮罩设置
|
||||
function LingLongBaoJingPanel:RefreshTreasureMaskByType(typeIndex,value)
|
||||
for k,v in pairs(data) do
|
||||
if v.typeIndex == typeIndex then
|
||||
if v.typeIndex == typeIndex and not isClose then
|
||||
self.itemList[v.typeIndex][v.address].mask.gameObject:SetActive(value)
|
||||
end
|
||||
end
|
||||
|
@ -357,6 +383,12 @@ end
|
|||
|
||||
---界面关闭时调用(用于子类重写)
|
||||
function LingLongBaoJingPanel:OnClose()
|
||||
isClose = true
|
||||
if drop then
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
drop = nil
|
||||
end)
|
||||
end
|
||||
--self.parent.tabbox.gameObject:SetActive(true)
|
||||
self.fx_linglongbaojing_long.gameObject:SetActive(false)
|
||||
self.fx_linglongbaojing_chuxian.gameObject:SetActive(false)
|
||||
|
@ -411,16 +443,21 @@ end
|
|||
|
||||
---转盘滚动特效重设 1移动速度,值越小越快 2是否停止 3停止位置
|
||||
function LingLongBaoJingPanel:TurnEffectReset(turnSpeed,treasureType,isStop,pos,func)
|
||||
if not self.turnEffect then
|
||||
self.turnEffect = Timer.New()
|
||||
end
|
||||
self.turnEffect:Reset(function()
|
||||
if curTurnPos > #self.itemList[treasureType] then
|
||||
curTurnPos = 1
|
||||
end
|
||||
if curTurnPos == 1 then
|
||||
self.itemList[treasureType][#self.itemList[treasureType]].selectKuang.gameObject:SetActive(false)
|
||||
else
|
||||
self.itemList[treasureType][curTurnPos - 1].selectKuang.gameObject:SetActive(false)
|
||||
if not isClose then
|
||||
if curTurnPos == 1 then
|
||||
self.itemList[treasureType][#self.itemList[treasureType]].selectKuang.gameObject:SetActive(false)
|
||||
else
|
||||
self.itemList[treasureType][curTurnPos - 1].selectKuang.gameObject:SetActive(false)
|
||||
end
|
||||
self.itemList[treasureType][curTurnPos].selectKuang.gameObject:SetActive(true)
|
||||
end
|
||||
self.itemList[treasureType][curTurnPos].selectKuang.gameObject:SetActive(true)
|
||||
if treasureType == 2 then
|
||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_neiquanlunge_007)
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue