【PVP】战斗结算界面提交
chenyuqi
parent
2193cb7d0f
commit
06a03039a6
|
|
@ -89,7 +89,7 @@ GameObject:
|
|||
- component: {fileID: 4179291497716199166}
|
||||
- component: {fileID: 8775451192418676946}
|
||||
m_Layer: 5
|
||||
m_Name: Image_TopBG
|
||||
m_Name: TopBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1208,7 +1208,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3386464059210549857}
|
||||
m_Layer: 5
|
||||
m_Name: Top
|
||||
m_Name: Image_TopBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 3886916635378755538}
|
||||
m_Father: {fileID: 4631708303834684374}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -281,7 +282,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000015258789}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1821, y: 981}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8638322508741452326
|
||||
|
|
@ -671,8 +672,8 @@ MonoBehaviour:
|
|||
isShowArrow: 0
|
||||
lines: 1
|
||||
squareSpacing: 5
|
||||
cell: {fileID: 0}
|
||||
Spacing: {x: 0, y: 0}
|
||||
cell: {fileID: 3863990344507934503}
|
||||
Spacing: {x: 70, y: 0}
|
||||
row: 0
|
||||
col: 0
|
||||
paddingTop: 0
|
||||
|
|
@ -933,7 +934,6 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 9183640655460290876}
|
||||
- {fileID: 3886916635378755538}
|
||||
- {fileID: 1107300475768798969}
|
||||
- {fileID: 6197615293666758457}
|
||||
- {fileID: 6005220860767210916}
|
||||
|
|
@ -1556,6 +1556,7 @@ GameObject:
|
|||
- component: {fileID: 7878271609675812052}
|
||||
- component: {fileID: 4075495205725776542}
|
||||
- component: {fileID: 3563584272461327573}
|
||||
- component: {fileID: 1465925809309136152}
|
||||
m_Layer: 5
|
||||
m_Name: RewardScroll
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1651,6 +1652,30 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1465925809309136152
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5039589248571422903}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2afdea96f23d9c24daa7ca2362138277, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
firstArrow: {fileID: 0}
|
||||
endArrow: {fileID: 0}
|
||||
dir: 0
|
||||
isShowArrow: 0
|
||||
lines: 1
|
||||
squareSpacing: 5
|
||||
cell: {fileID: 4931018164103117483}
|
||||
Spacing: {x: 0, y: 0}
|
||||
row: 0
|
||||
col: 0
|
||||
paddingTop: 0
|
||||
paddingLeft: 0
|
||||
--- !u!1 &5390332914881279863
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1802,7 +1827,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4487087015830191846
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1815,7 +1840,6 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 346543456543178205}
|
||||
- {fileID: 317204508480045368}
|
||||
- {fileID: 2929836364151349365}
|
||||
m_Father: {fileID: 3262352779321219605}
|
||||
|
|
@ -2072,7 +2096,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 8169663366616448392}
|
||||
m_Father: {fileID: 5024199190355810733}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -2405,6 +2430,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -2416,13 +2456,148 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1038258404428910860}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1097249133279408440
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3560430642548369593}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5428043307070786451, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: GenericItem
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5428043307070786451, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 188
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 188
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 94.29999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -94
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3720d7cdc0e2b344aad835c6907f3c98, type: 3}
|
||||
--- !u!1 &4931018164103117483 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5428043307070786451, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1097249133279408440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &8169663366616448392 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 9104677325257608368, guid: 3720d7cdc0e2b344aad835c6907f3c98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1097249133279408440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3802255764086835239
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 56579655420487193}
|
||||
m_TransformParent: {fileID: 3458509384107684584}
|
||||
m_Modifications:
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
|
|
@ -2437,22 +2612,22 @@ PrefabInstance:
|
|||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
|
|
@ -2462,7 +2637,7 @@ PrefabInstance:
|
|||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 198.4012
|
||||
value: 198.40118
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
|
|
@ -2502,12 +2677,12 @@ PrefabInstance:
|
|||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -775.2265
|
||||
value: 92.68469
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 86.166824
|
||||
value: -99.00017
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
|
|
@ -2527,13 +2702,34 @@ PrefabInstance:
|
|||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UIHeadItemNode0
|
||||
value: UIHeadItemNode
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7474818533381218414, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4fddb87277d3f624690d18025b8bf46e, type: 3}
|
||||
--- !u!1 &3863990344507934503 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3802255764086835239}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &3886916635378755538 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 87056508505649141, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
|
|
@ -2653,6 +2849,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -2777,6 +2988,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -2901,6 +3127,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -2943,7 +3184,7 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -2953,17 +3194,17 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 195
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 188
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -3003,12 +3244,12 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 292.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -94
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -3149,6 +3390,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -3273,6 +3529,21 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: UIHeadItemNode6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 97942048081743616, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1845105482955706171, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ImageRarityDark
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8253534492494253764, guid: 4fddb87277d3f624690d18025b8bf46e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Image_Job
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -3315,7 +3586,7 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -3325,17 +3596,17 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 195
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 188
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -3375,12 +3646,12 @@ PrefabInstance:
|
|||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 97.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -94
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
|
|
@ -3408,127 +3679,3 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8808090996296617352}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8833076993864331629
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 4487087015830191846}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5428043307070786451, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BaseItem
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65, type: 3}
|
||||
--- !u!224 &346543456543178205 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 9104677325257608368, guid: 1c8f96bbc1fab2a4dad67d5e9e439a65,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8833076993864331629}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ public partial class UIManager
|
|||
_WindowMeta(UINameConst.UITaskTip, UIWindowLayer.Tips);
|
||||
_WindowMeta(UINameConst.UI_PVPRankInfo, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UI_PVPRankReward, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UI_PVPSettlement, UIWindowLayer.Normal);
|
||||
_WindowMeta(UINameConst.UI_MusicPanel, UIWindowLayer.Normal, UIOpenType.FullScreen);
|
||||
|
||||
_WindowMeta(UINameConst.UI_Transition, UIWindowLayer.Waiting);
|
||||
|
|
@ -246,6 +247,7 @@ public static class UINameConst
|
|||
public static readonly string UI_PVPDefendPrepare = "PVP/UI_DefendSetting";//"PVP/UI_PVPDefendPrepare";
|
||||
public static readonly string UI_PVPRankInfo = "PVP/UI_PVPRankInfo";
|
||||
public static readonly string UI_PVPRankReward = "PVP/UI_PVPRankReward";
|
||||
public static readonly string UI_PVPSettlement = "PVP/UI_PVPSettlement";
|
||||
|
||||
public static readonly string UI_Shop = "Interface/Shop/UI_Shop";
|
||||
public static readonly string UI_Purchase = "Interface/Shop/UI_Purchase";
|
||||
|
|
|
|||
|
|
@ -289,6 +289,19 @@ namespace Gameplay.Level
|
|||
AudioManager.Instance.AudioMgrObj.StopMusicById(_bgmID);
|
||||
}
|
||||
|
||||
public async UniTask OnPVPSettle()
|
||||
{
|
||||
if (CurrentLevel.IsPvPLevel)
|
||||
{
|
||||
ShowTransitionMgr.Instance.ExitTransition();
|
||||
await ShowTransitionMgr.Instance.EnterBlack();
|
||||
await UniTask.Delay(250);
|
||||
await UI_PVPSettlementController.Open(PVPManager.Instance.IsWin);
|
||||
await ShowTransitionMgr.Instance.ExitBlack();
|
||||
ShowTransitionMgr.Instance.ExitTransition();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion API
|
||||
}
|
||||
}
|
||||
|
|
@ -14,8 +14,8 @@ namespace Gameplay.Level
|
|||
public partial class LevelManager
|
||||
{
|
||||
private LevelSettleData _cacheSettleData;
|
||||
|
||||
public LevelSettleData SettleData => _cacheSettleData;
|
||||
public PVPSettleData PvpSettleData;
|
||||
|
||||
private List<uint> _showCharIDs; //结算动画展示角色
|
||||
private uint _showVehicleID; //结算动画展示载具
|
||||
|
|
@ -185,5 +185,20 @@ namespace Gameplay.Level
|
|||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// pvp的结算数据缓存
|
||||
/// </summary>
|
||||
public class PVPSettleData
|
||||
{
|
||||
public int Score;
|
||||
public int Rank;
|
||||
|
||||
public PVPSettleData()
|
||||
{
|
||||
Score = PVPManager.Instance.score;
|
||||
Rank = PVPManager.Instance.order;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -58,9 +58,18 @@ namespace Gameplay.Net
|
|||
|
||||
if (!CommonUtils.ItemSourceNotShowInItemWindow.Contains((ItemSource)m_PB.ItemSource))
|
||||
{
|
||||
if ((ItemSource)m_PB.ItemSource == ItemSource.LevelUp && LevelManager.Instance.IsInLevel)
|
||||
if (LevelManager.Instance.IsInLevel)
|
||||
{
|
||||
return;
|
||||
if ((ItemSource)m_PB.ItemSource == ItemSource.LevelUp)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if ((ItemSource)m_PB.ItemSource == ItemSource.PvpBattle)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
await UI_GetItemWindowController.Open(Actor.Instance.RewardItems.Get(m_PB.ItemSource));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ public partial class PVPManager
|
|||
return;
|
||||
IsFighting = true;
|
||||
_fightKey = key;
|
||||
LevelManager.Instance.PvpSettleData = new PVPSettleData();
|
||||
LevelManager.Instance.EnterLevelDirectly(_pvpLevelInfo.ID, null, _currEnemy.pvpDefenderData);
|
||||
}
|
||||
|
||||
|
|
@ -78,6 +79,6 @@ public partial class PVPManager
|
|||
{
|
||||
IsFighting = false;
|
||||
_currEnemy = null;
|
||||
LevelManager.Instance.ExitLevelDirectly();
|
||||
//LevelManager.Instance.ExitLevelDirectly();
|
||||
}
|
||||
}
|
||||
|
|
@ -83,6 +83,7 @@ public class UIFightSceneController : UIWindow
|
|||
EventManager.Instance.Register(EventManager.EventName.UI_SKILL_CANCEL, OnSkillEnd);
|
||||
EventManager.Instance.Register(EventManager.EventName.INFIGHT_SKILL_ACTON_UNIT, (Action<GameUnit>)OnAttachToUnit);
|
||||
EventManager.Instance.Register(EventManager.EventName.UI_START_USE_SKILL, (Action<GameUnit>)OnEnterSkillPut);
|
||||
EventManager.Instance.Register(EventManager.EventName.OnGetPVPInformation, _OnPVPSettle);
|
||||
|
||||
_InitWeatherInfo();
|
||||
//_scrollOccupy.Init(_RefreshItem);
|
||||
|
|
@ -695,6 +696,7 @@ public class UIFightSceneController : UIWindow
|
|||
EventManager.Instance.Unregister(EventManager.EventName.INFIGHT_SKILL_ACTON_UNIT, (Action<GameUnit>)OnAttachToUnit);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.UI_START_USE_SKILL, (Action<GameUnit>)OnEnterSkillPut);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.UI_SKILL_CANCEL, OnSkillEnd);
|
||||
EventManager.Instance.Unregister(EventManager.EventName.OnGetPVPInformation, _OnPVPSettle);
|
||||
}
|
||||
|
||||
#region Events
|
||||
|
|
@ -918,6 +920,11 @@ public class UIFightSceneController : UIWindow
|
|||
_UpdateUnitBloodArrow(_lastAttackedUnit, true);
|
||||
}
|
||||
|
||||
private async void _OnPVPSettle()
|
||||
{
|
||||
await LevelManager.Instance.OnPVPSettle();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region SkillMask
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ public class UIPassGameController : UIWindow
|
|||
public override void OnRelease()
|
||||
{
|
||||
base.OnRelease();
|
||||
AudioManager.Instance.AudioMgrObj.StopAllSounds();
|
||||
if (_seq != null)
|
||||
{
|
||||
DOTween.Kill(_seq);
|
||||
|
|
@ -202,7 +203,7 @@ public class UIPassGameController : UIWindow
|
|||
|
||||
protected override void OnHideWindow()
|
||||
{
|
||||
AudioManager.Instance.AudioMgrObj.StopAllSounds();
|
||||
//AudioManager.Instance.AudioMgrObj.StopAllSounds();
|
||||
|
||||
base.OnHideWindow();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using Framework;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.UIElements;
|
||||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using Toggle = UnityEngine.UI.Toggle;
|
||||
using ScrollView = PhxhSDK.PhxhScrollView;
|
||||
|
||||
public class UI_PVPSettlementBinder
|
||||
{
|
||||
|
||||
public static void GetComponents(UI_PVPSettlementController window)
|
||||
{
|
||||
window.Image_BottomDark = window.GetComponent<Image>("Image_BottomDark");
|
||||
window.RawImage_Characters = window.GetComponent<RawImage>("RawImage_Characters");
|
||||
window.Image_BG = window.GetComponent<Image>("Image_BG");
|
||||
window.Text_Settlement = window.GetComponent<TMP_Text>("Image_BG/Text_Settlement");
|
||||
window.Image_BlueBar = window.GetComponent<Image>("Image_BG/Text_Settlement/Image_BlueBar");
|
||||
window.Text_Score = window.GetComponent<TMP_Text>("Image_BG/Text_Score");
|
||||
window.Text_ScoreCurrent = window.GetComponent<TMP_Text>("Image_BG/Text_Score/Text_ScoreCurrent");
|
||||
window.Text_ScoreChange = window.GetComponent<TMP_Text>("Image_BG/Text_Score/Text_ScoreChange");
|
||||
window.Text_Rank = window.GetComponent<TMP_Text>("Image_BG/Text_Rank");
|
||||
window.Text_RankCurrent = window.GetComponent<TMP_Text>("Image_BG/Text_Rank/Text_RankCurrent");
|
||||
window.Text_RankChange = window.GetComponent<TMP_Text>("Image_BG/Text_Rank/Text_RankChange");
|
||||
window.Text_Rewards = window.GetComponent<TMP_Text>("Image_BG/Text_Rewards");
|
||||
window.Image_DownShadow = window.GetComponent<Image>("Image_BG/HeroLevelUp/Image_DownShadow");
|
||||
window.Button_Close = window.GetComponent<Button>("Button_Close");
|
||||
|
||||
}
|
||||
|
||||
/****** 定义变量语句 ******
|
||||
public Image Image_BottomDark;
|
||||
public RawImage RawImage_Characters;
|
||||
public Image Image_BG;
|
||||
public TMP_Text Text_Settlement;
|
||||
public Image Image_BlueBar;
|
||||
public TMP_Text Text_Score;
|
||||
public TMP_Text Text_ScoreCurrent;
|
||||
public TMP_Text Text_ScoreChange;
|
||||
public TMP_Text Text_Rank;
|
||||
public TMP_Text Text_RankCurrent;
|
||||
public TMP_Text Text_RankChange;
|
||||
public TMP_Text Text_Rewards;
|
||||
public Image Image_DownShadow;
|
||||
public Button Button_Close;
|
||||
|
||||
****** End ******/
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e231c524332b2644284e5369667abe29
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -35,6 +35,8 @@ public class UI_GetItemWindowController : UIWindow
|
|||
private GameObject _scrollView;
|
||||
private GameObject _scrollContent;
|
||||
private GameObject _goMaskBg;
|
||||
|
||||
private Action _callBackFunc;
|
||||
|
||||
public enum EShowType
|
||||
{
|
||||
|
|
@ -46,32 +48,34 @@ public class UI_GetItemWindowController : UIWindow
|
|||
{
|
||||
public EShowType type;
|
||||
public ListItem listItem;
|
||||
public Action cb;
|
||||
|
||||
public Param(EShowType Etype, ListItem list)
|
||||
public Param(EShowType Etype, ListItem list, Action callBack = null)
|
||||
{
|
||||
type = Etype;
|
||||
listItem = list;
|
||||
cb = callBack;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 打开奖励获取界面
|
||||
/// </summary>
|
||||
public static async UniTask<UIWindow> Open(ItemCounts itemCounts, EShowType type = EShowType.Normal)
|
||||
public static async UniTask<UIWindow> Open(ItemCounts itemCounts, EShowType type = EShowType.Normal, Action cb = null)
|
||||
{
|
||||
ListItem itemList = new(itemCounts);
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, itemList));
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, itemList, cb));
|
||||
}
|
||||
|
||||
public static async UniTask<UIWindow> Open(ListItem itemList, EShowType type = EShowType.Normal)
|
||||
public static async UniTask<UIWindow> Open(ListItem itemList, EShowType type = EShowType.Normal, Action cb = null)
|
||||
{
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, itemList));
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, itemList, cb));
|
||||
}
|
||||
|
||||
public static async UniTask<UIWindow> Open(ItemList itemList, EShowType type = EShowType.Normal)
|
||||
public static async UniTask<UIWindow> Open(ItemList itemList, EShowType type = EShowType.Normal, Action cb = null)
|
||||
{
|
||||
ListItem listItem = new(itemList);
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, listItem));
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_GetItemWindow, new Param(type, listItem, cb));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -133,6 +137,7 @@ public class UI_GetItemWindowController : UIWindow
|
|||
var param = (Param)data;
|
||||
mItems = param.listItem;
|
||||
_showType = param.type;
|
||||
_callBackFunc = param.cb;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -197,6 +202,8 @@ public class UI_GetItemWindowController : UIWindow
|
|||
{
|
||||
LevelManager.Instance.ExitLevelDirectly();
|
||||
}
|
||||
|
||||
_callBackFunc?.Invoke();
|
||||
CloseWindow();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,266 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using DG.Tweening;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine.UIElements;
|
||||
using Button = UnityEngine.UI.Button;
|
||||
using Image = UnityEngine.UI.Image;
|
||||
using Toggle = UnityEngine.UI.Toggle;
|
||||
using ScrollView = PhxhSDK.PhxhScrollView;
|
||||
using Framework;
|
||||
using Gameplay;
|
||||
using Gameplay.Common;
|
||||
using Gameplay.Level;
|
||||
using Gameplay.Net;
|
||||
using NLDPB;
|
||||
using PhxhSDK;
|
||||
|
||||
public class UI_PVPSettlementController : UIWindow
|
||||
{
|
||||
//UI GameObj
|
||||
///Auto Gen Start///
|
||||
public Image Image_BottomDark;
|
||||
public RawImage RawImage_Characters;
|
||||
public Image Image_BG;
|
||||
public TMP_Text Text_Settlement;
|
||||
public Image Image_BlueBar;
|
||||
public TMP_Text Text_Score;
|
||||
public TMP_Text Text_ScoreCurrent;
|
||||
public TMP_Text Text_ScoreChange;
|
||||
public TMP_Text Text_Rank;
|
||||
public TMP_Text Text_RankCurrent;
|
||||
public TMP_Text Text_RankChange;
|
||||
public TMP_Text Text_Rewards;
|
||||
public Image Image_DownShadow;
|
||||
public Button Button_Close;
|
||||
|
||||
///Auto Gen End///
|
||||
|
||||
private RecycleView _scrollReward;
|
||||
|
||||
private RecycleView _scrollHead;
|
||||
|
||||
private bool _isSuccess;
|
||||
private bool _isPlaying;
|
||||
private PVPSettleData _settleData;
|
||||
private PVPSettleData _newPVPData;
|
||||
private Sequence _seq;
|
||||
|
||||
private List<RewardItem> _rewardItems = new();
|
||||
private Team _team;
|
||||
private List<uint> _characterIDs;
|
||||
|
||||
public static async UniTask<UIWindow> Open(bool isSuccess = false)
|
||||
{
|
||||
return await UIManager.Instance.CreateAndOpenWindow(UINameConst.UI_PVPSettlement, isSuccess);
|
||||
}
|
||||
// deal with input data
|
||||
public override void PreLoad(object data = null)
|
||||
{
|
||||
_isSuccess = (bool)data;
|
||||
}
|
||||
|
||||
// Use this for initialization
|
||||
public override void OnInit()
|
||||
{
|
||||
//bind UI GameObj
|
||||
UI_PVPSettlementBinder.GetComponents(this);
|
||||
_scrollReward = GetComponent<RecycleView>("Image_BG/Text_Rewards/RewardScroll");
|
||||
_scrollHead = GetComponent<RecycleView>("Image_BG/HeroLevelUp/Image_DownShadow/CharacterView");
|
||||
|
||||
_settleData = LevelManager.Instance.PvpSettleData;
|
||||
_newPVPData = new PVPSettleData();
|
||||
|
||||
_scrollReward.Init(_RefreshRewardItem);
|
||||
_scrollHead.Init(_RefreshCharacterItem);
|
||||
|
||||
BindButton(Button_Close, OnClickClose);
|
||||
}
|
||||
|
||||
//invoke when open window
|
||||
protected override void OnShowWindow(object data = null)
|
||||
{
|
||||
_Refresh();
|
||||
}
|
||||
|
||||
//invoke when reload window
|
||||
protected override void OnReloadWindow(object data = null)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//invoke when close window
|
||||
protected override void OnHideWindow()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//invoke when destroy
|
||||
public override void OnRelease()
|
||||
{
|
||||
base.OnRelease();
|
||||
_seq.Kill();
|
||||
_seq = null;
|
||||
}
|
||||
|
||||
private async void OnClickClose()
|
||||
{
|
||||
if (_isPlaying)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var itemList = Actor.Instance.RewardItems;
|
||||
Action cb = () =>
|
||||
{
|
||||
LevelManager.Instance.ExitLevelDirectly();
|
||||
};
|
||||
if (itemList.Lists[(int)ItemSource.PvpBattle].Ids.Count > 0)
|
||||
{
|
||||
await UI_GetItemWindowController.Open(itemList, UI_GetItemWindowController.EShowType.Normal, cb);
|
||||
}
|
||||
else
|
||||
{
|
||||
LevelManager.Instance.ExitLevelDirectly();
|
||||
}
|
||||
//LevelManager.Instance.ExitLevelDirectly();
|
||||
CloseWindow();
|
||||
}
|
||||
|
||||
#region Refresh
|
||||
|
||||
private void _Refresh()
|
||||
{
|
||||
_RefreshTitle();
|
||||
_RefreshAnim();
|
||||
_RefreshRewards();
|
||||
_RefreshCharacters();
|
||||
}
|
||||
|
||||
private void _RefreshTitle()
|
||||
{
|
||||
var strKey = _isSuccess ? "pvp_settle_title_suc" : "pvp_settle_title_defeat";
|
||||
Text_Settlement.text = CommonUtils.GetLocalizeText(strKey);
|
||||
}
|
||||
|
||||
private void _RefreshAnim()
|
||||
{
|
||||
if (_seq == null)
|
||||
{
|
||||
_seq = DOTween.Sequence();
|
||||
}
|
||||
_RefreshScore();
|
||||
_RefreshRank();
|
||||
}
|
||||
|
||||
private void _RefreshScore()
|
||||
{
|
||||
var old = _settleData.Score;
|
||||
var now = _newPVPData.Score;
|
||||
var add = now - old;
|
||||
if (add == 0)
|
||||
Text_ScoreChange.text = "";
|
||||
else
|
||||
Text_ScoreChange.text = _isSuccess? $"<color=#00ff33>+{add}</color>" : $"<color=#FE4B62>{add}</color>";
|
||||
_PlayScoreAnim(now, old);
|
||||
}
|
||||
|
||||
private void _RefreshRank()
|
||||
{
|
||||
var old = _settleData.Rank;
|
||||
var now = _newPVPData.Rank;
|
||||
var add = old - now;
|
||||
if (add == 0)
|
||||
Text_RankChange.text = "";
|
||||
else
|
||||
{
|
||||
if (old <= 0 && add < 0)
|
||||
{
|
||||
add = -add;
|
||||
}
|
||||
Text_RankChange.text = _isSuccess? $"<color=#00ff33>+{add}</color>" : $"<color=#FE4B62>{add}</color>";
|
||||
}
|
||||
_PlayRankAnim(old, now);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Anim
|
||||
|
||||
private void _PlayScoreAnim(int old, int now)
|
||||
{
|
||||
var tw = DOTween.To(() => old, value =>
|
||||
{
|
||||
_isPlaying = true;
|
||||
Text_ScoreCurrent.text = value.ToString();
|
||||
}, now, 1.5f);
|
||||
_seq.Append(tw);
|
||||
}
|
||||
|
||||
private void _PlayRankAnim(int old, int now)
|
||||
{
|
||||
var tw = DOTween.To(() => old, value =>
|
||||
{
|
||||
Text_RankCurrent.text = value.ToString();
|
||||
}, now, 1.5f);
|
||||
_seq.Join(tw);
|
||||
_seq.AppendCallback(() =>
|
||||
{
|
||||
_isPlaying = false;
|
||||
});
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region ScrollView
|
||||
|
||||
private void _RefreshRewards()
|
||||
{
|
||||
var rewardID = _isSuccess? GLConfig.Inst.data.PvpBattleWinRewards : GLConfig.Inst.data.PvpBattleLoseRewards;
|
||||
_rewardItems = RewardManager.Instance.Get(rewardID).ItemList.Get();
|
||||
_scrollReward.ShowList(_rewardItems.Count);
|
||||
}
|
||||
|
||||
private void _RefreshRewardItem(GameObject cell, int index)
|
||||
{
|
||||
var genericItem = new GenericItem(cell);
|
||||
var item = _rewardItems[index];
|
||||
genericItem.SetInfo(item.ID, item.Count);
|
||||
}
|
||||
|
||||
private void _RefreshCharacters()
|
||||
{
|
||||
_team = TeamEditManager.Instance.GetSelectTeam();
|
||||
var characterIDs = _team.GetCharacterIDs();
|
||||
_characterIDs = new List<uint>();
|
||||
for (int i = 0; i < characterIDs.Length; i++)
|
||||
{
|
||||
if (characterIDs[i] > 0)
|
||||
{
|
||||
_characterIDs.Add(characterIDs[i]);
|
||||
}
|
||||
}
|
||||
_scrollHead.ShowList(_characterIDs.Count);
|
||||
}
|
||||
|
||||
private void _RefreshCharacterItem(GameObject cell, int index)
|
||||
{
|
||||
var headNode = CommonUtils.GetComponent<UIHeadItemNode>(cell);
|
||||
if (headNode)
|
||||
{
|
||||
var characterID = _characterIDs[index];
|
||||
var headInfo = new UIHeadInfo(characterID, false)
|
||||
{
|
||||
IsShowPro = true,
|
||||
IsShowRarity = true
|
||||
};
|
||||
headNode.SetData(headInfo);
|
||||
headNode.Refresh();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4296438f8acf707429de9783ede30ea5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue