parent
8f31b07d52
commit
259155fe52
|
@ -4554,7 +4554,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199787422305027156
|
--- !u!199 &199787422305027156
|
||||||
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}
|
||||||
|
@ -9203,7 +9203,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199651780022285358
|
--- !u!199 &199651780022285358
|
||||||
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}
|
||||||
|
@ -15958,6 +15958,80 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u795E\u5C0630 \u7EA7\u53EF\u4E0A\u9635"
|
m_Text: "\u795E\u5C0630 \u7EA7\u53EF\u4E0A\u9635"
|
||||||
LanguageIndex: 10641
|
LanguageIndex: 10641
|
||||||
|
--- !u!1 &5301349196742872791
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4198500793958213807}
|
||||||
|
- component: {fileID: 7327902130160948670}
|
||||||
|
- component: {fileID: 278468242562828256}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: redpoint
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4198500793958213807
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5301349196742872791}
|
||||||
|
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: 491038039515440220}
|
||||||
|
m_RootOrder: 13
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 30, y: 30}
|
||||||
|
m_Pivot: {x: 1, y: 1}
|
||||||
|
--- !u!222 &7327902130160948670
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5301349196742872791}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &278468242562828256
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5301349196742872791}
|
||||||
|
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &5320935866364803173
|
--- !u!1 &5320935866364803173
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -19130,8 +19204,8 @@ RectTransform:
|
||||||
m_Father: {fileID: 4398956386574498604}
|
m_Father: {fileID: 4398956386574498604}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.25, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.25, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 2, y: -20}
|
m_SizeDelta: {x: 2, y: -20}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
@ -19281,7 +19355,7 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.25, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
@ -19490,7 +19564,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &491038039515440220
|
--- !u!224 &491038039515440220
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -19515,6 +19589,7 @@ RectTransform:
|
||||||
- {fileID: 4094384560749403343}
|
- {fileID: 4094384560749403343}
|
||||||
- {fileID: 1152054752262580392}
|
- {fileID: 1152054752262580392}
|
||||||
- {fileID: 476036203437658873}
|
- {fileID: 476036203437658873}
|
||||||
|
- {fileID: 4198500793958213807}
|
||||||
m_Father: {fileID: 9217646665226819579}
|
m_Father: {fileID: 9217646665226819579}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -20849,20 +20924,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -20874,15 +20954,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21019,20 +21094,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21044,15 +21124,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21189,20 +21264,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21214,15 +21294,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21359,20 +21434,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21384,15 +21464,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21529,20 +21604,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21554,15 +21634,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21699,20 +21774,25 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.2600002
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -21724,15 +21804,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -16.999998
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 3.2600002
|
value: -16.999998
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.2600002
|
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
@ -1285,7 +1285,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 2426259688454935488}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -59461,7 +59461,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &4643422383628229334
|
--- !u!224 &4643422383628229334
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -59472,13 +59472,14 @@ RectTransform:
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
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: 2149297425152283749}
|
||||||
m_Father: {fileID: 1530677021}
|
m_Father: {fileID: 1530677021}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 6
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 66, y: -950.2}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 127, y: 128}
|
m_SizeDelta: {x: 127, y: 128}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3776263709751302196
|
--- !u!222 &3776263709751302196
|
||||||
|
@ -110074,6 +110075,80 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: -0.24871063, y: -2.5024486}
|
m_AnchoredPosition: {x: -0.24871063, y: -2.5024486}
|
||||||
m_SizeDelta: {x: 0.49744, y: 0}
|
m_SizeDelta: {x: 0.49744, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &7564142054981787630
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2149297425152283749}
|
||||||
|
- component: {fileID: 5178552856880474712}
|
||||||
|
- component: {fileID: 6887605263866915285}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: redpot
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2149297425152283749
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7564142054981787630}
|
||||||
|
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: 4643422383628229334}
|
||||||
|
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: 33.5, y: 34}
|
||||||
|
m_SizeDelta: {x: 30, y: 30}
|
||||||
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!222 &5178552856880474712
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7564142054981787630}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6887605263866915285
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7564142054981787630}
|
||||||
|
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7568746678401654118
|
--- !u!1 &7568746678401654118
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -915,6 +915,7 @@ RedPointType = {
|
||||||
|
|
||||||
wujinMission = 8500,
|
wujinMission = 8500,
|
||||||
wujinTreasure = 8501,
|
wujinTreasure = 8501,
|
||||||
|
wujinBianDui = 8502,
|
||||||
}
|
}
|
||||||
|
|
||||||
RedPointStatus = {
|
RedPointStatus = {
|
||||||
|
|
|
@ -265,6 +265,10 @@ function this:OnClose()
|
||||||
-- liveNames[o] = nil
|
-- liveNames[o] = nil
|
||||||
-- end
|
-- end
|
||||||
end
|
end
|
||||||
|
if this.curFormationIndex == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||||
|
EndLessMapManager.SetCanUseHeroNew()
|
||||||
|
CheckRedPointStatus(RedPointType.wujinBianDui)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnDestroy()
|
function this:OnDestroy()
|
||||||
|
@ -678,7 +682,12 @@ function this.SingleHeroDataShow(_go, _heroData)
|
||||||
local yuanImage = Util.GetGameObject(go, "yuanImage")
|
local yuanImage = Util.GetGameObject(go, "yuanImage")
|
||||||
local choosedObj = Util.GetGameObject(go, "choosed")
|
local choosedObj = Util.GetGameObject(go, "choosed")
|
||||||
local hpExp = Util.GetGameObject(go, "hpExp")
|
local hpExp = Util.GetGameObject(go, "hpExp")
|
||||||
|
local redPot = Util.GetGameObject(go, "redpoint")
|
||||||
|
if heroData.isNew and heroData.isNew == 1 then
|
||||||
|
redPot.gameObject:SetActive(true)
|
||||||
|
else
|
||||||
|
redPot.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
|
|
||||||
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
|
||||||
icon.sprite=this.spLoader:LoadSprite(heroData.icon)
|
icon.sprite=this.spLoader:LoadSprite(heroData.icon)
|
||||||
|
|
|
@ -89,6 +89,7 @@ function this.On_Btn2_Click()
|
||||||
return a.position < b.position
|
return a.position < b.position
|
||||||
end)
|
end)
|
||||||
EndLessMapManager.formation = FormationManager.formationList[this.root.curFormationIndex].teamHeroInfos
|
EndLessMapManager.formation = FormationManager.formationList[this.root.curFormationIndex].teamHeroInfos
|
||||||
|
EndLessMapManager.SetCanUseHeroNew()
|
||||||
this.root:ClosePanel()
|
this.root:ClosePanel()
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[10712])
|
PopupTipPanel.ShowTip(Language[10712])
|
||||||
|
@ -189,6 +190,7 @@ end
|
||||||
|
|
||||||
--- 关闭界面事件
|
--- 关闭界面事件
|
||||||
function this.OnCloseBtnClick()
|
function this.OnCloseBtnClick()
|
||||||
|
EndLessMapManager.SetCanUseHeroNew()
|
||||||
this.root:ClosePanel()
|
this.root:ClosePanel()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -182,6 +182,8 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
||||||
isFindHandBook = isFindHandBook or true
|
isFindHandBook = isFindHandBook or true
|
||||||
if isFindHandBook then --图鉴
|
if isFindHandBook then --图鉴
|
||||||
PlayerManager.SetHeroHandBookListData(heroData.id, heroData.star)
|
PlayerManager.SetHeroHandBookListData(heroData.id, heroData.star)
|
||||||
|
CheckRedPointStatus(RedPointType.wujinBianDui)
|
||||||
|
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||||
end
|
end
|
||||||
heroData.warPower = this.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower]
|
heroData.warPower = this.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower]
|
||||||
--远征初始化血量
|
--远征初始化血量
|
||||||
|
|
|
@ -499,10 +499,33 @@ function this.GetCanUseHeroDatas()
|
||||||
this.canUseHeroDatas = {}
|
this.canUseHeroDatas = {}
|
||||||
end
|
end
|
||||||
for k,v in pairs(this.heroDataLists) do
|
for k,v in pairs(this.heroDataLists) do
|
||||||
if PlayerManager.GetHeroDataByStar(0,v.id) and not this.canUseHeroDatas[v.dynamicId] then
|
if PlayerManager.GetHeroDataByStar(0,v.id) then
|
||||||
|
if not this.canUseHeroDatas[v.dynamicId] then
|
||||||
this.canUseHeroDatas[v.dynamicId] = v
|
this.canUseHeroDatas[v.dynamicId] = v
|
||||||
end
|
end
|
||||||
|
local isNew = 0
|
||||||
|
if not PlayerPrefs.HasKey("endlessCanUseHero"..PlayerManager.uid..v.dynamicId) then
|
||||||
|
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,1)
|
||||||
end
|
end
|
||||||
|
isNew = PlayerPrefs.GetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId)
|
||||||
|
this.canUseHeroDatas[v.dynamicId].isNew = isNew
|
||||||
|
LogGreen("this.canUseHeroDatas[v.dynamicId].isNew:"..this.canUseHeroDatas[v.dynamicId].isNew)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.SetCanUseHeroNew()
|
||||||
|
LogGreen("111:")
|
||||||
|
if not this.canUseHeroDatas then
|
||||||
|
this.GetCanUseHeroDatas()
|
||||||
|
end
|
||||||
|
LogGreen("222:")
|
||||||
|
for k,v in pairs(this.canUseHeroDatas) do
|
||||||
|
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0)
|
||||||
|
v.isNew = 0
|
||||||
|
LogGreen("v.isNew:"..v.isNew)
|
||||||
|
end
|
||||||
|
CheckRedPointStatus(RedPointType.wujinBianDui)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetHeroDataByProperty(_proId)
|
function this.GetHeroDataByProperty(_proId)
|
||||||
|
@ -902,7 +925,21 @@ function this.ChecRedPointEndLess()
|
||||||
if not isShow then
|
if not isShow then
|
||||||
isShow = this.CheckoutRedPointMission()
|
isShow = this.CheckoutRedPointMission()
|
||||||
end
|
end
|
||||||
|
if not isShow then
|
||||||
|
isShow = this.CheckCanUseHeroNew()
|
||||||
|
end
|
||||||
return isShow
|
return isShow
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.CheckCanUseHeroNew()
|
||||||
|
this.GetCanUseHeroDatas()
|
||||||
|
for k,v in pairs(this.canUseHeroDatas) do
|
||||||
|
LogGreen("v.isNew:"..v.isNew)
|
||||||
|
if v.isNew and v.isNew == 1 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
-------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------
|
||||||
return this
|
return this
|
|
@ -40,6 +40,7 @@ function EndLessMapView:InitComponent(gameObject, mapPanel)
|
||||||
this.areaName = Util.GetGameObject(gameObject, "endLessTitle/AreaImg/mapName"):GetComponent("Text")
|
this.areaName = Util.GetGameObject(gameObject, "endLessTitle/AreaImg/mapName"):GetComponent("Text")
|
||||||
this.btnReset = Util.GetGameObject(gameObject, "rightDown/btnReset")
|
this.btnReset = Util.GetGameObject(gameObject, "rightDown/btnReset")
|
||||||
this.btnFormat = Util.GetGameObject(gameObject, "rightDown/btnFormat")
|
this.btnFormat = Util.GetGameObject(gameObject, "rightDown/btnFormat")
|
||||||
|
this.btnFormatRed = Util.GetGameObject(this.btnFormat, "redpot")
|
||||||
this.btnNote = Util.GetGameObject(gameObject, "rightDown/btnNote")
|
this.btnNote = Util.GetGameObject(gameObject, "rightDown/btnNote")
|
||||||
this.btnNoteRed = Util.GetGameObject(this.btnNote, "redPoint")
|
this.btnNoteRed = Util.GetGameObject(this.btnNote, "redPoint")
|
||||||
-- 谢置按钮
|
-- 谢置按钮
|
||||||
|
@ -347,7 +348,7 @@ function EndLessMapView:OnShow()
|
||||||
-- this:GetBagEnergy()
|
-- this:GetBagEnergy()
|
||||||
-- EndLessMapManager.isUpdateOnClose = false
|
-- EndLessMapManager.isUpdateOnClose = false
|
||||||
--end
|
--end
|
||||||
|
BindRedPointObject(RedPointType.wujinBianDui,this.btnFormatRed)
|
||||||
-- 如果全屏界面打开时刷新过,重新激活界面需要刷新一次
|
-- 如果全屏界面打开时刷新过,重新激活界面需要刷新一次
|
||||||
if EndLessMapManager.isUpdateOnClose then
|
if EndLessMapManager.isUpdateOnClose then
|
||||||
this.GetBagEnergy()
|
this.GetBagEnergy()
|
||||||
|
@ -746,6 +747,7 @@ function EndLessMapView:OnClose()
|
||||||
if not this:IsEndLessMap() then return end
|
if not this:IsEndLessMap() then return end
|
||||||
-- this.warn:SetActive(false)
|
-- this.warn:SetActive(false)
|
||||||
Util.ClearChild(this.selectHeroGrid.transform)
|
Util.ClearChild(this.selectHeroGrid.transform)
|
||||||
|
ClearRedPointObject(RedPointType.wujinBianDui,this.btnFormatRed)
|
||||||
this.heroList = {}
|
this.heroList = {}
|
||||||
this.isPanelClose = true
|
this.isPanelClose = true
|
||||||
EndLessMapManager.isUpdateOnClose = false
|
EndLessMapManager.isUpdateOnClose = false
|
||||||
|
|
|
@ -304,6 +304,10 @@ function this.UpdateEventPoint(msg, optionId, func)
|
||||||
NetManager.RequestAllHeroHp(function ()
|
NetManager.RequestAllHeroHp(function ()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.RefreshHeroData)
|
Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.RefreshHeroData)
|
||||||
end)
|
end)
|
||||||
|
elseif behaviorType == 55 then
|
||||||
|
behaviorNodeList = {
|
||||||
|
{"DeletePoint", {pos = MapManager.curTriggerPos}},
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 没有行为
|
-- 没有行为
|
||||||
|
|
|
@ -110,7 +110,6 @@ function this.InitRedPointAllRelate()
|
||||||
-- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
|
-- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial)
|
||||||
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
|
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
|
||||||
RPData:SetParent(RedPointType.EndlessPanel, RedPointType.EndLess)
|
RPData:SetParent(RedPointType.EndlessPanel, RedPointType.EndLess)
|
||||||
|
|
||||||
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
|
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
|
||||||
-- 充值
|
-- 充值
|
||||||
--(24暂时关闭)放开这里就行
|
--(24暂时关闭)放开这里就行
|
||||||
|
@ -526,6 +525,7 @@ function this.RegisterRedCheckFunc()
|
||||||
--十五日登陆
|
--十五日登陆
|
||||||
RPData:AddCheckFunc(RedPointType.FifteenDayGift_1,FifteenDayGiftManager.CheckRedPoint)
|
RPData:AddCheckFunc(RedPointType.FifteenDayGift_1,FifteenDayGiftManager.CheckRedPoint)
|
||||||
|
|
||||||
|
RPData:AddCheckFunc(RedPointType.wujinBianDui,EndLessMapManager.CheckCanUseHeroNew)
|
||||||
RPData:AddCheckFunc(RedPointType.wujinTreasure,EndLessMapManager.CheckoutRedPointTreasure)
|
RPData:AddCheckFunc(RedPointType.wujinTreasure,EndLessMapManager.CheckoutRedPointTreasure)
|
||||||
RPData:AddCheckFunc(RedPointType.wujinMission,EndLessMapManager.CheckoutRedPointMission)
|
RPData:AddCheckFunc(RedPointType.wujinMission,EndLessMapManager.CheckoutRedPointMission)
|
||||||
RPData:SetParent(RedPointType.EndlessPanel, EndLessMapManager.ChecRedPointEndLess)
|
RPData:SetParent(RedPointType.EndlessPanel, EndLessMapManager.ChecRedPointEndLess)
|
||||||
|
|
Loading…
Reference in New Issue