diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
index 63a27897cc..8951c474a4 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab
@@ -194,10 +194,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 2213795117448012445}
- {fileID: 1056658779926410244}
- {fileID: 4594030120788499568}
+ - {fileID: 7862755249693379654}
+ - {fileID: 849232697611936852}
+ - {fileID: 4415562500684457673}
m_Father: {fileID: 2646731207937964690}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -226,7 +230,7 @@ MonoBehaviour:
m_StartAxis: 0
m_CellSize: {x: 260, y: 74}
m_Spacing: {x: 70, y: 0}
- m_Constraint: 2
+ m_Constraint: 0
m_ConstraintCount: 1
--- !u!1 &774404263436714776
GameObject:
@@ -685,9 +689,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 4769235708667615956}
- {fileID: 2729895378572737907}
- {fileID: 2326936323343625867}
- - {fileID: 4769235708667615956}
m_Father: {fileID: 2948461849611934824}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -762,6 +766,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 3535724585431877029}
- {fileID: 8420829159650770875}
m_Father: {fileID: 2948461849611934824}
m_RootOrder: 2
@@ -887,6 +892,423 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
+--- !u!1 &1886555622241362601
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4415562500684457673}
+ - component: {fileID: 5310010421152871149}
+ - component: {fileID: 3343438603854077913}
+ - component: {fileID: 7629321322898533273}
+ - component: {fileID: 6659046941954560426}
+ m_Layer: 5
+ m_Name: btnSwitch
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4415562500684457673
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1886555622241362601}
+ 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:
+ - {fileID: 5965938361109776806}
+ m_Father: {fileID: 9080930959813644782}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5310010421152871149
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1886555622241362601}
+ m_CullTransparentMesh: 0
+--- !u!114 &3343438603854077913
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1886555622241362601}
+ 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &7629321322898533273
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1886555622241362601}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91,
+ type: 3}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3343438603854077913}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &6659046941954560426
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1886555622241362601}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &2302207383086437862
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 849232697611936852}
+ - component: {fileID: 2238687463138444611}
+ - component: {fileID: 4058792762392479001}
+ - component: {fileID: 5152882597525267461}
+ - component: {fileID: 9181461389647033540}
+ m_Layer: 5
+ m_Name: btnDown
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &849232697611936852
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2302207383086437862}
+ 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:
+ - {fileID: 7957401726970040744}
+ m_Father: {fileID: 9080930959813644782}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2238687463138444611
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2302207383086437862}
+ m_CullTransparentMesh: 0
+--- !u!114 &4058792762392479001
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2302207383086437862}
+ 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &5152882597525267461
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2302207383086437862}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91,
+ type: 3}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 4058792762392479001}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &9181461389647033540
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2302207383086437862}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &2390771010507205880
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7862755249693379654}
+ - component: {fileID: 7017181475138128679}
+ - component: {fileID: 7168988630504116472}
+ - component: {fileID: 4745333128976462393}
+ - component: {fileID: 5482371207078151738}
+ m_Layer: 5
+ m_Name: btnWear
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7862755249693379654
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2390771010507205880}
+ 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:
+ - {fileID: 1709807167061502100}
+ m_Father: {fileID: 9080930959813644782}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7017181475138128679
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2390771010507205880}
+ m_CullTransparentMesh: 0
+--- !u!114 &7168988630504116472
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2390771010507205880}
+ 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &4745333128976462393
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2390771010507205880}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 3
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91,
+ type: 3}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 7168988630504116472}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &5482371207078151738
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2390771010507205880}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &2536559242930971238
GameObject:
m_ObjectHideFlags: 0
@@ -1233,8 +1655,103 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5FA1\u517D\u7279\u6743\u7684\u8BC1\u660E\uFF0C\u6BCF\u65E5\u53EF\u989D\u5916\u589E\u52A03\u6B21\u514D\u8D39\u7684\u5FA1\u517D\u658B\u62DB\u52DF\u673A\u4F1A\uFF0C\u540C\u65F6\u5FA1\u517D\u658B\u5996\u6676\u62DB\u52DF\u4EF7\u683C\u53D8\u4E3A8\u6298\uFF08\u6709\u6548\u671F15\u5929\uFF09"
+ m_Text:
LanguageIndex: 0
+--- !u!1 &3443099234728031772
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3535724585431877029}
+ - component: {fileID: 8009934677158004745}
+ - component: {fileID: 4065358339931771419}
+ - component: {fileID: 6866049918682599845}
+ m_Layer: 5
+ m_Name: line
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3535724585431877029
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3443099234728031772}
+ 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: 6594472603124481167}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -4}
+ m_SizeDelta: {x: 900, y: 8}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8009934677158004745
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3443099234728031772}
+ m_CullTransparentMesh: 0
+--- !u!114 &4065358339931771419
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3443099234728031772}
+ 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: 19d5542f3ad36154883cfc2022d17e0a, 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!114 &6866049918682599845
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3443099234728031772}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 1
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: -1
+ m_PreferredHeight: -1
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!1 &3445964426451991267
GameObject:
m_ObjectHideFlags: 0
@@ -1246,6 +1763,7 @@ GameObject:
- component: {fileID: 2213795117448012445}
- component: {fileID: 2819780029074760282}
- component: {fileID: 8686039646618364367}
+ - component: {fileID: 4514218720624134123}
m_Layer: 5
m_Name: line
m_TagString: Untagged
@@ -1264,13 +1782,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 2646731207937964690}
- m_RootOrder: 2
+ m_Father: {fileID: 9080930959813644782}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 898.92, y: 4.4399414}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -2.2199707}
+ m_SizeDelta: {x: 898.9199, y: 4.4399414}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2819780029074760282
CanvasRenderer:
@@ -1309,6 +1827,26 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!114 &4514218720624134123
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3445964426451991267}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 1
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: -1
+ m_PreferredHeight: -1
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!1 &3535740045006279959
GameObject:
m_ObjectHideFlags: 0
@@ -1412,9 +1950,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 5910622177605777387}
- {fileID: 7413896144707926636}
- {fileID: 419973099449890293}
- - {fileID: 5910622177605777387}
m_Father: {fileID: 2948461849611934824}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1489,9 +2027,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 5064459159964646332}
- - {fileID: 5156414679612966604}
- - {fileID: 2213795117448012445}
+ - {fileID: 4216490824860228586}
- {fileID: 9080930959813644782}
m_Father: {fileID: 5981932543035177726}
m_RootOrder: 2
@@ -1564,7 +2100,7 @@ RectTransform:
m_Children:
- {fileID: 8569408221378906818}
m_Father: {fileID: 7691181773687293707}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1764,7 +2300,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2810699418929311819}
- m_Father: {fileID: 2646731207937964690}
+ m_Father: {fileID: 4216490824860228586}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2159,7 +2695,7 @@ RectTransform:
m_Children:
- {fileID: 338931501448661155}
m_Father: {fileID: 6594472603124481167}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2511,7 +3047,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
- m_Bottom: 20
+ m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 0
@@ -2548,7 +3084,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7691181773687293707}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2598,6 +3134,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A"
LanguageIndex: 0
+--- !u!1 &6488529673665977620
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7957401726970040744}
+ - component: {fileID: 7112625355716638700}
+ - component: {fileID: 4605580236290634966}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7957401726970040744
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6488529673665977620}
+ 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: 849232697611936852}
+ 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: -1.44, y: 0.39999998}
+ m_SizeDelta: {x: 157.13, y: 65.07}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7112625355716638700
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6488529673665977620}
+ m_CullTransparentMesh: 0
+--- !u!114 &4605580236290634966
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6488529673665977620}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 45
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u5378 \u4E0B"
+ LanguageIndex: 0
--- !u!1 &6720717534400615127
GameObject:
m_ObjectHideFlags: 0
@@ -2724,7 +3340,7 @@ RectTransform:
m_Children:
- {fileID: 2727579049058978229}
m_Father: {fileID: 9080930959813644782}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2863,7 +3479,7 @@ RectTransform:
m_Children:
- {fileID: 8858296579630562323}
m_Father: {fileID: 9080930959813644782}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2969,6 +3585,67 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &7270151132506234573
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4216490824860228586}
+ - component: {fileID: 8414286998778897234}
+ m_Layer: 0
+ m_Name: howGet
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4216490824860228586
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7270151132506234573}
+ 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:
+ - {fileID: 5064459159964646332}
+ - {fileID: 5156414679612966604}
+ m_Father: {fileID: 2646731207937964690}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 925, y: 320}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8414286998778897234
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7270151132506234573}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 7
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
--- !u!1 &7319278289409754231
GameObject:
m_ObjectHideFlags: 0
@@ -3160,7 +3837,7 @@ RectTransform:
m_Children:
- {fileID: 6281791081528390200}
m_Father: {fileID: 4139601617807381921}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -3236,11 +3913,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7691181773687293707}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 4}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -4}
m_SizeDelta: {x: 900, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6744055517912544592
@@ -3380,7 +4057,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
- m_Text: "\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0,\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0\u8FD9\u662F\u4E00\u4E2A\u6280\u80FD\u63CF\u8FF0"
+ m_Text:
--- !u!114 &5887821664597300103
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3395,6 +4072,166 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
+--- !u!1 &8254995966597053491
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5965938361109776806}
+ - component: {fileID: 1318409445117556025}
+ - component: {fileID: 4371138232716543770}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5965938361109776806
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8254995966597053491}
+ 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: 4415562500684457673}
+ 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: -1.44, y: 0.39999998}
+ m_SizeDelta: {x: 157.13, y: 65.07}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1318409445117556025
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8254995966597053491}
+ m_CullTransparentMesh: 0
+--- !u!114 &4371138232716543770
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8254995966597053491}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 45
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u66FF \u6362"
+ LanguageIndex: 0
+--- !u!1 &8290781136667670758
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1709807167061502100}
+ - component: {fileID: 4519899433599853935}
+ - component: {fileID: 2661482151605681515}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1709807167061502100
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8290781136667670758}
+ 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: 7862755249693379654}
+ 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: -1.44, y: 0.39999998}
+ m_SizeDelta: {x: 157.13, y: 65.07}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4519899433599853935
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8290781136667670758}
+ m_CullTransparentMesh: 0
+--- !u!114 &2661482151605681515
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8290781136667670758}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 45
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u7A7F \u6234"
+ LanguageIndex: 0
--- !u!1 &8323301169910056047
GameObject:
m_ObjectHideFlags: 0
@@ -3424,7 +4261,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3662551404232341007}
- m_Father: {fileID: 2646731207937964690}
+ m_Father: {fileID: 4216490824860228586}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -3471,11 +4308,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4139601617807381921}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 4}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -4}
m_SizeDelta: {x: 900, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6573378233760763815
@@ -3603,7 +4440,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4139601617807381921}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
index 2f826a521c..cc052e6ce0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
@@ -455,9 +455,9 @@ function this.SingleItemDataShow(_go, _itemData)
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
if _itemData.itemConfig then
if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip then
- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData, function()
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, _itemData,1,true,true,nil,function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
- end,nil,true)
+ end)
elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱
UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
index c18a27e21b..32c4fcbc88 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
@@ -87,7 +87,7 @@ function BagResolveAnCompoundPanel:BindEvent()
PopupTipPanel.ShowTip(Language[10182])
end
elseif openLayoutType==2 then
- UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup)
+ UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup2)
if equipData then
curResolveAllItemList={}
local equip = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua
index 1f0216b91a..b8442f43e1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua
@@ -119,7 +119,8 @@ function this.SetItemShow(drop)
elseif itemDataList[i].itemType==2 then
Util.AddOnceClick(itemIcon, function()
Log("itemDataList[i].backData "..itemDataList[i].backData.equipId)
- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemDataList[i].backData)
+ -- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemDataList[i].backData)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, itemDataList[i],0,true,false)
end)
elseif itemDataList[i].itemType==3 then
Util.AddOnceClick(itemIcon, function()
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua
index 1251ea82fe..b324d31a1f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonMopUpEndPanel.lua
@@ -240,7 +240,8 @@ function this.SetItemData(go, itemdata)
elseif itemdata.itemType==2 then
EquipManager.UpdateEquipData(itemdata.backData)
Util.AddOnceClick(itemIcon, function()
- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemdata.backData)
+ -- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemdata.backData)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, itemdata,0,true,false)
end)
elseif itemdata.itemType==3 then
HeroManager.UpdateHeroDatas(itemdata.backData)
diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
index 3220f5d59e..8163a95dd8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
@@ -422,7 +422,8 @@ function this.SystemItemAdapter(node, data, isShowTime)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
local itemData = {}
itemData.id = data.itemId
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
elseif itemDataConFig.ItemType == ItemType.Talisman then
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua
index e75ec2ed27..98f30c9813 100644
--- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua
@@ -218,7 +218,8 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
-- LogPink("_itemData.Id:"..tostring(_itemData.Id))
local itemData = {}
itemData.id = _itemData.Id
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
end)
end
@@ -274,7 +275,8 @@ function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
local itemData = {}
itemData.id = _itemData.Id
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
end, 0.5)
end
--加减方法
diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
index 755409ced5..57f6aaca39 100644
--- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
@@ -689,7 +689,8 @@ function HandBookHeroAndEquipListPanel:OnShowSingleEquipData(_go,_equipData)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
local _itemData = {}
_itemData.id = equipData.Id
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0)
end)
if PlayerManager.equipHandBook[equipData.Id] == nil then
Util.SetGray(_go, true)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
index 92a153ba23..33c20516cf 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
@@ -6,7 +6,11 @@ local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig
local _BaseProList = {}--基础属性对象
local _suitProList = {}--套装属性对象
local _superProList = {}--白金属性对象
-local isShowfenjie =true
+local typeToUpdate = {
+ [2] = 2,--已穿戴->卸载单件
+ [3] = 1,--未穿戴->穿单件
+ [4] = 3,--未穿戴->替换单件
+}
--初始化组件(用于子类重写)
function RewardEquipSingleShowPopup2:InitComponent()
self.spLoader = SpriteLoader.New()
@@ -45,8 +49,13 @@ function RewardEquipSingleShowPopup2:InitComponent()
--分解按钮--btmBar
self.btmBar = Util.GetGameObject(self.transform, "Content/btmBar")
- self.btnSure = Util.GetGameObject(self.btmBar, "btnGrid/btnSure")
- self.btnJump = Util.GetGameObject(self.btmBar, "btnGrid/btnJump")
+ self.howGet = Util.GetGameObject(self.btmBar, "howGet")
+ self.btnGrid = Util.GetGameObject(self.btmBar, "btnGrid")
+ self.btnSure = Util.GetGameObject(self.btnGrid, "btnSure")
+ self.btnJump = Util.GetGameObject(self.btnGrid, "btnJump")
+ self.btnWear = Util.GetGameObject(self.btnGrid, "btnWear")
+ self.btnDown = Util.GetGameObject(self.btnGrid, "btnDown")
+ self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch")
--装备获取途径--btmBar
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
@@ -64,7 +73,7 @@ function RewardEquipSingleShowPopup2:BindEvent()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
- --使用
+ --跳转
Util.AddClick(self.btnJump, function()
if self.equipData.itemConfig then
JumpManager.GoJump(self.equipData.itemConfig.UseJump)
@@ -95,6 +104,40 @@ function RewardEquipSingleShowPopup2:BindEvent()
PopupTipPanel.ShowTip(Language[11506])
end
end)
+ --穿戴
+ Util.AddClick(self.btnWear, function()
+ local equipIdList={}
+ local equipDataList={}
+ table.insert(equipIdList,tostring(self.equipData.id))
+ table.insert(equipDataList,self.equipData)
+ NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,1,function ()
+ self:ClosePanel()
+ self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,0,self.position)
+ end)
+ end)
+ --卸下
+ Util.AddClick(self.btnDown, function()
+ local equipIdList={}
+ local equipDataList={}
+ table.insert(equipIdList,tostring(self.equipData.id))
+ table.insert(equipDataList,self.equipData)
+ NetManager.EquipUnLoadOptRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
+ self:ClosePanel()
+ self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList)
+ end)
+ end)
+
+ --替换
+ Util.AddClick(self.btnSwitch, function()
+ local equipIdList={}
+ local equipDataList={}
+ table.insert(equipIdList,tostring(self.equipData.id))
+ table.insert(equipDataList,self.nextEquip)
+ NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
+ self:ClosePanel()
+ self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.equipData,self.position)
+ end)
+ end)
end
--添加事件监听(用于子类重写)
@@ -108,22 +151,37 @@ function RewardEquipSingleShowPopup2:RemoveListener()
end
--界面打开时调用(用于子类重写)
-function RewardEquipSingleShowPopup2:OnOpen(_equipData,_openType,_isRewardItemPop,_curHeroData)
+function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShowGet,_isShowGo,_curHeroData,_position,_targetEquipData,_func)
if not _equipData then
return
end
- self.equipData = _equipData
- self.openType = _openType
- self.isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false
- self.curHeroData = _curHeroData
+ self.parent = _parent --父界面
+ self.equipData = _equipData --当前装备数据
+ self.openType = _openType --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换)
+ self.howGet:SetActive(_isShowGet and true or false)--是否显示获取途径
+ self.btnGrid:SetActive(self.openType ~= 0)
+ self.curHeroData = _curHeroData --装备了该装备的英雄数据
+ self.position = _position --装备的位置
+ self.nextEquip = _targetEquipData--要替换的目标装备
+ self.isShowGo = _isShowGo and _isShowGo or false--是否显示跳转按钮
+ self.func = _func
+end
+
+function RewardEquipSingleShowPopup2:SetBtns()
+ local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
+ self.btnSure:SetActive(itemConfigData.IfResolve==1)
+ self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel)
+ self.btnWear:SetActive(self.openType == 3)
+ self.btnDown:SetActive(self.openType == 2)
+ self.btnSwitch:SetActive(self.openType == 4)
end
function RewardEquipSingleShowPopup2:OnShow()
--上部装备基础信息
- LogBlue(self.equipData.id)
+ Log("装备id:"..tostring(self.equipData.id).." openType:"..tostring(self.openType))
+ self:SetBtns()
local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
- self.btnSure:SetActive(itemConfigData.IfResolve==1)
self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfigData.Quality)
self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
@@ -134,7 +192,6 @@ function RewardEquipSingleShowPopup2:OnShow()
EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id)
self.equipType.text=Language[11089]..GetEquipPosStrByEquipPosNum(equipConfigData.Position)
--下部按钮信息
- self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel)
self.effectbaijin:SetActive(equipConfigData.Quality==7)
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
@@ -162,10 +219,10 @@ function RewardEquipSingleShowPopup2:OnShow()
end
--suitPro套装属性
+ local equipSuit = {}
if self.curHeroData then
- -- body
+ equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
end
- local equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
if suitConFig[equipConfigData.Star] then
self.suitPro:SetActive(true)
@@ -181,8 +238,9 @@ function RewardEquipSingleShowPopup2:OnShow()
_suitProList[i].gameObject:SetActive(true)
local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text")
local value = Util.GetGameObject(_suitProList[i].transform, "proVale"):GetComponent("Text")
- name.text = "" .. GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info) .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) .. ""
- value.text = "(" .. curSuitConFig.SuiteValue[i][1] .. Language[11091]
+ local color = #equipSuit >= i and "00ff66" or "FCEBCA"
+ name.text = string.format("%s+ %s",color,GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]))
+ value.text = string.format("(%s件激活)",color,curSuitConFig.SuiteValue[i][1])
end
end
else
@@ -204,21 +262,17 @@ function RewardEquipSingleShowPopup2:OnShow()
for i = 1, #curSuitConFig.SuiteSkill do
local go = _superProList[i]
go.gameObject:SetActive(true)
- local Star = curSuitConFig.Id
- local suitNum = curSuitConFig.SuiteSkill[i][1]
- local passiveId = curSuitConFig.SuiteSkill[i][2]
- go:GetComponent("Text").text = "" .. GetLanguageStrById(passiveSkillConfig[passiveId].Desc) .. ""
- Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text").text = "(" .. GetEquipSuitStr(Star,suitNum) .. ")"
- Util.GetGameObject(go.transform, "Name"):GetComponent("Text").text = "不朽天赋" .. i .. ":"
+ local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
+ local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
+ local color = #equipSuit >= i and "00ff66" or "FCEBCA"
+ name.text = string.format("不朽天赋%s:",i)
+ go:GetComponent("Text").text = string.format("%s",color,GetLanguageStrById(passiveSkillConfig[curSuitConFig.SuiteSkill[i][2]].Desc))
+ value.text = string.format("(%s)",GetEquipSuitStr(curSuitConFig.Id,curSuitConFig.SuiteSkill[i][1]))
end
end
else
self.superPro:SetActive(false)
end
- --(此处需要三遍才能完全打开)
- ForceRebuildLayout(self.midBar.transform)
- ForceRebuildLayout(self.midBar.transform)
- ForceRebuildLayout(self.midBar.transform)
--获取途径
if self.jumpViewList and #self.jumpViewList > 0 then
@@ -231,15 +285,25 @@ function RewardEquipSingleShowPopup2:OnShow()
if curitemData.Jump and #curitemData.Jump>0 then
self.canGetScrollView:SetData(curitemData.Jump,function (index, item)
local tempView = nil
- if self.isRewardItemPop then
- tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
- else
+ if self.isShowGo then
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true)
+ else
+ tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
end
table.insert(self.jumpViewList,tempView)
end,true,true)
end
end
+
+
+ --(此处需要三遍才能完全打开)
+ ForceRebuildLayout(self.midBar.transform)
+ ForceRebuildLayout(self.midBar.transform)
+ ForceRebuildLayout(self.midBar.transform)
+
+ if self.func then
+ self.func()
+ end
end
--界面关闭时调用(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
index 1946c1a264..bf95393e6c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
@@ -409,7 +409,8 @@ function this.EquipInfo()
local frameBtn = Util.GetGameObject(pos, "mask")
Util.AddOnceClick(frameBtn, function()
if curEquipData then
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i],0,nil,0)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i],0,nil,0)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, curHeroEquipDatas[i],0,false,false,curHeroData)
end
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
index c7c8acd7d7..960dc62b05 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
@@ -664,7 +664,7 @@ function this:SingleDataShow(go,index)
function()
if curHeroEquipDatas[index] then
curSelectEquipData = curHeroEquipDatas[index]
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[index])
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,curHeroEquipDatas[index],2,false,nil,curHeroData)
elseif curEquipTreasureDatas[index] then
if itemConfig[curEquipTreasureDatas[index].id].ItemType == ItemType.EquipTreasure then
local pos = 0
@@ -843,10 +843,10 @@ function this.SingleItemDataShow(_go, _itemData)
if curHeroData.harmonyGongMing then
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
else
- UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,3,curHeroData,curHeroEquipDatas[equipConfig[_itemData.id].Position],nextEquipData,equipConfig[_itemData.id].Position)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,4,false,nil, curHeroData,equipConfig[_itemData.id].Position,nextEquipData)
end
else
- UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,1,curHeroData,_itemData,equipConfig[_itemData.id].Position)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,3,false,nil, curHeroData,equipConfig[_itemData.id].Position)
end
end
)
diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua
index f407a81a44..c688bc7ec5 100644
--- a/Assets/ManagedResources/~Lua/View/ItemView.lua
+++ b/Assets/ManagedResources/~Lua/View/ItemView.lua
@@ -210,7 +210,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
_itemData.id = _itemData.configData.Id
- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
+ -- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
@@ -274,7 +275,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
--Log("self.isRewardItemPop "..tostring(self.isRewardItemPop))
- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
+ -- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
@@ -507,7 +509,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
local _itemData = {}
_itemData.id = itemSId
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
elseif itemDataConFig.ItemType == ItemType.Pokemon then
--异妖配件
@@ -729,7 +732,8 @@ function ItemView:OnBtnCkickEvent(itemSId)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
local _itemData = {}
_itemData.id = itemDataConFig.Id
- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ -- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
+ UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
elseif itemDataConFig.ItemType == ItemType.Blueprint then
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id)
if lanTuData then