分解提交

dev_chengFeng
jiaoyangna 2020-07-11 16:21:15 +08:00
parent 27343e6fca
commit 0fb81547d3
10 changed files with 633 additions and 290 deletions

View File

@ -113,7 +113,7 @@ RectTransform:
m_Children:
- {fileID: 105217687}
m_Father: {fileID: 1564542999}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -647,7 +647,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1564542999}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2183,7 +2183,9 @@ RectTransform:
m_Children:
- {fileID: 356395711}
- {fileID: 1498705158}
- {fileID: 5243383083069948696}
- {fileID: 7174822345508030668}
- {fileID: 5538532293572091745}
- {fileID: 6430118627428784244}
- {fileID: 431991881}
- {fileID: 123376724}
m_Father: {fileID: 2925180131101153177}
@ -4056,133 +4058,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &660733738534269233
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5243383083069948696}
- component: {fileID: 8501265530357514882}
- component: {fileID: 2882175440410618158}
- component: {fileID: 4591855627060158439}
m_Layer: 5
m_Name: slider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5243383083069948696
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 660733738534269233}
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: 3878861972126916785}
- {fileID: 7174822345508030668}
- {fileID: 6430118627428784244}
m_Father: {fileID: 1564542999}
m_RootOrder: 2
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: 10.6, y: -36.9}
m_SizeDelta: {x: 500.7, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8501265530357514882
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 660733738534269233}
m_CullTransparentMesh: 0
--- !u!114 &2882175440410618158
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 660733738534269233}
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: 56fac6a71666a884ab673e0440500d73, 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 &4591855627060158439
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 660733738534269233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -113659843, 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: 1
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: 0}
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: 2882175440410618158}
m_FillRect: {fileID: 3878861972126916785}
m_HandleRect: {fileID: 0}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &674300681881531200
GameObject:
m_ObjectHideFlags: 0
@ -4528,80 +4403,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &829902589578666620
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3878861972126916785}
- component: {fileID: 3821813800963169080}
- component: {fileID: 2466106615396291320}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3878861972126916785
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 829902589578666620}
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: 5243383083069948696}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3821813800963169080
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 829902589578666620}
m_CullTransparentMesh: 0
--- !u!114 &2466106615396291320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 829902589578666620}
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: e9e281c5fb3c9ab4f8c7d5777e7fe83b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 0
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &842299406892042400
GameObject:
m_ObjectHideFlags: 0
@ -4628,17 +4429,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 842299406892042400}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5243383083069948696}
m_RootOrder: 1
m_Father: {fileID: 1564542999}
m_RootOrder: 2
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: 284.4, y: 0}
m_SizeDelta: {x: 40, y: 42}
m_AnchoredPosition: {x: 313.9, y: -36.900024}
m_SizeDelta: {x: 84, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5090208315198769794
CanvasRenderer:
@ -4668,7 +4469,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 166b59b1a76c77044961d5c7aa65ccba, type: 3}
m_Sprite: {fileID: 21300000, guid: 686f02270a3afd3488e4c55325f2f723, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8302,6 +8103,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6D88\u8017"
LanguageIndex: 10512
--- !u!1 &2257006270348685415
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1004123578193272900}
- component: {fileID: 642541867615643742}
- component: {fileID: 7780875562903350242}
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1004123578193272900
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2257006270348685415}
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: 3955156632694980477}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &642541867615643742
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2257006270348685415}
m_CullTransparentMesh: 0
--- !u!114 &7780875562903350242
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2257006270348685415}
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: 9c0627ee297b0384eb6195e15129403b, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2278322464531502788
GameObject:
m_ObjectHideFlags: 0
@ -10276,6 +10151,42 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 300
--- !u!1 &3091719080195459235
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3955156632694980477}
m_Layer: 5
m_Name: Fill Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3955156632694980477
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3091719080195459235}
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: 1004123578193272900}
m_Father: {fileID: 5538532293572091745}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: -5.0000153, y: -0.00001001358}
m_SizeDelta: {x: -20, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3098774996468964872
GameObject:
m_ObjectHideFlags: 0
@ -11734,7 +11645,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5556697439961011925}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -12589,6 +12500,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4502575453775152244
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5203329596099368233}
- component: {fileID: 6630276942342069456}
- component: {fileID: 8184385035831765781}
m_Layer: 5
m_Name: Handle (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5203329596099368233
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4502575453775152244}
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: 8532216570708603994}
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: 12.999908, y: 31.6}
m_SizeDelta: {x: 52, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6630276942342069456
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4502575453775152244}
m_CullTransparentMesh: 0
--- !u!114 &8184385035831765781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4502575453775152244}
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: e805a7c8bfba08f43a9537644c62d7e7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4609751660530884286
GameObject:
m_ObjectHideFlags: 0
@ -13269,6 +13254,94 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u672C\u8F6E\u53EF\u4F7F\u7528\u6B21\u6570\uFF1A"
LanguageIndex: 11272
--- !u!1 &5052683625082334632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5538532293572091745}
- component: {fileID: 8984227355309771645}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5538532293572091745
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5052683625082334632}
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: 1306125489815119596}
- {fileID: 3955156632694980477}
- {fileID: 3405669023599981535}
m_Father: {fileID: 1564542999}
m_RootOrder: 3
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: 0, y: -36.1}
m_SizeDelta: {x: 509.27, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8984227355309771645
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5052683625082334632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -113659843, 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: 1
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: 15.47
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
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: 0}
m_FillRect: {fileID: 1004123578193272900}
m_HandleRect: {fileID: 8532216570708603994}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 100
m_WholeNumbers: 1
m_Value: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5057244224293877654
GameObject:
m_ObjectHideFlags: 0
@ -14089,6 +14162,51 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5395257821521579118
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8532216570708603994}
- component: {fileID: 5139153297311565386}
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8532216570708603994
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5395257821521579118}
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: 5203329596099368233}
m_Father: {fileID: 3405669023599981535}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 11.4}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5139153297311565386
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5395257821521579118}
m_CullTransparentMesh: 0
--- !u!1 &5402937203711883957
GameObject:
m_ObjectHideFlags: 0
@ -15814,6 +15932,7 @@ RectTransform:
m_Children:
- {fileID: 926897948709662338}
- {fileID: 8343017256815360034}
- {fileID: 5674564102985551873}
- {fileID: 6854770985968012242}
- {fileID: 4185662324875928463}
- {fileID: 9105178109845168829}
@ -16473,7 +16592,7 @@ RectTransform:
m_Children:
- {fileID: 5276369576742264329}
m_Father: {fileID: 5556697439961011925}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -16972,6 +17091,42 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6793774740260687022
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3405669023599981535}
m_Layer: 5
m_Name: Handle Slide Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3405669023599981535
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6793774740260687022}
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: 8532216570708603994}
m_Father: {fileID: 5538532293572091745}
m_RootOrder: 2
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}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6864998799337060965
GameObject:
m_ObjectHideFlags: 0
@ -18857,7 +19012,7 @@ RectTransform:
m_Children:
- {fileID: 5547895529972350345}
m_Father: {fileID: 5556697439961011925}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -19716,6 +19871,80 @@ MonoBehaviour:
m_LineSpacing: 1.14
m_Text: "\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E\u9996\u6B21\u91CD\u7F6E"
LanguageIndex: 11252
--- !u!1 &8389822962984347059
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1306125489815119596}
- component: {fileID: 9075026027484266343}
- component: {fileID: 4034715472030958669}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1306125489815119596
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8389822962984347059}
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: 5538532293572091745}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: -0.00001001358}
m_SizeDelta: {x: 0, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9075026027484266343
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8389822962984347059}
m_CullTransparentMesh: 0
--- !u!114 &4034715472030958669
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8389822962984347059}
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: b62ceaa016421b243bcaa158f3aa968d, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8398429055688717561
GameObject:
m_ObjectHideFlags: 0
@ -20103,17 +20332,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8603848061001280458}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5243383083069948696}
m_RootOrder: 2
m_Father: {fileID: 1564542999}
m_RootOrder: 4
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: -284.9, y: 0}
m_SizeDelta: {x: 40, y: 42}
m_AnchoredPosition: {x: -317.08, y: -36.900024}
m_SizeDelta: {x: 84, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &340723222237291217
CanvasRenderer:
@ -20143,7 +20372,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f2feadb1d86a5a34ea728f294b22d38b, type: 3}
m_Sprite: {fileID: 21300000, guid: de6a17d0f5b6eeb4bac265faeaef8cc5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -20268,6 +20497,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8843234757119310071
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5674564102985551873}
- component: {fileID: 4355643461188886943}
- component: {fileID: 6245160726883562843}
m_Layer: 5
m_Name: tipText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5674564102985551873
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8843234757119310071}
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: 5556697439961011925}
m_RootOrder: 2
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: 0, y: 45}
m_SizeDelta: {x: 896.2, y: 74.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4355643461188886943
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8843234757119310071}
m_CullTransparentMesh: 0
--- !u!114 &6245160726883562843
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8843234757119310071}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &8846243046883531082
GameObject:
m_ObjectHideFlags: 0

View File

@ -21,6 +21,8 @@ local compoundMaxNum=0
local equipData
local callBackFun
local count
--初始化组件(用于子类重写)
function BagResolveAnCompoundPanel:InitComponent()
@ -85,7 +87,11 @@ function BagResolveAnCompoundPanel:BindEvent()
curResolveAllItemList={}
local equip = {}
equip.itemId = equipData.id
equip.itemNum = 1
if not count then
equip.itemNum = 1
else
equip.itemNum = count
end
table.insert(curResolveAllItemList,equip)
local type=1
NetManager.UseAndPriceItemRequest(type,curResolveAllItemList,function (drop)
@ -193,6 +199,7 @@ function BagResolveAnCompoundPanel:OnOpen(...)
itemResolveType=data[2]
equipData=data[3]
callBackFun = data[4]
count = data[5]
this.OnShowLayout2Data()
elseif openLayoutType==3 then--碎片合成
itemData=data[2]
@ -384,22 +391,11 @@ function this.SendBackResolveReCallBack(drop)
end
end)
else
BagManager.OnShowTipDropNumZero(drop)
if callBackFun then
callBackFun()
end
BagManager.OnShowTipDropNumZero(drop)
end
if itemResolveType==ItemBaseType.Equip then--装备
for i = 1, #curResolveAllItemList do
EquipManager.DeleteSingleEquip(curResolveAllItemList[i])
end
else--道具
--改为后端刷新了
--for i = 1, #curResolveAllItemList do
-- BagManager.UpdateItemsNum(curResolveAllItemList[i].itemId,curResolveAllItemList[i].itemNum)
--end
if callBackFun then
callBackFun()
end
--
end
function this.SendBackCompoundReCallBack(drop)
this:ClosePanel()

View File

@ -192,16 +192,22 @@ function GMPanel:BindEvent()
chooseID = 1
Util.AddClick(this.btnGenRole, function()
if not this.strMsg.text or this.strMsg.text == "" then
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do
local str=chooseID.."#"..v.Id.."#"..1
LogBlue(str)
NetManager.GMEvent(str)
end
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) do
local str=chooseID.."#"..v.Id.."#"..1
LogBlue(str)
NetManager.GMEvent(str)
end
return
end
local str = chooseID .. "#" .. this.strMsg.text
Log(str)
NetManager.GMEvent(str)
-- for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do
-- local str=chooseID.."#"..v.Id.."#"..2
-- LogBlue(str)
-- NetManager.GMEvent(str)
-- end
end)
Util.AddClick(this.GenerateHero, function()
Log(this.strInputFieldHeroMsg.text)

View File

@ -62,9 +62,11 @@ function RewardEquipSingleShowPopup:BindEvent()
end
end)
Util.AddClick(this.btnSure, function()
--数量大于1 ,弹选择框
if BagManager.GetItemCountById(equipData.id) > 1 then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipSingleSell,equipData)
else
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipSingleSell,equipData,func)
elseif BagManager.GetItemCountById(equipData.id) == 1 then
--只有一个分解品质大于4 弹框
if equipData.itemConfig.Quantity>=4 then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel,2,equipData.itemConfig.ItemBaseType,equipData,function ()
if func then
@ -82,6 +84,8 @@ function RewardEquipSingleShowPopup:BindEvent()
this.SendBackResolveReCallBack(drop)
end)
end
else
PopupTipPanel.ShowTip("无此装备")
end
end)
Util.AddClick(this.btnLock, function()
@ -245,7 +249,6 @@ function this.SendBackResolveReCallBack(drop)
else
BagManager.OnShowTipDropNumZero(drop)
end
EquipManager.DeleteSingleEquip(equipData.id)
if func then
func()
end

View File

@ -29,7 +29,14 @@ function this:BindEvent()
parent:ClosePanel()
end)
Util.AddClick(this.confirmBtn,function()
NetManager.UseAndPriceItemRequest(1, selectEquipsData, function(msg)
local data = {}
for k,v in ipairs(selectEquipsData) do
local equip = {}
equip.itemId = v.id
equip.itemNum = v.num
table.insert(data,equip)
end
NetManager.UseAndPriceItemRequest(1, data, function(msg)
parent:ClosePanel()
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
BagManager.OnShowTipDropNumZero(msg)

View File

@ -11,20 +11,11 @@ local dropList = {}
local itemList = {}
--传入选择英雄
local selectEquipTreasureData
local func
local count = 0
function this:SetCount(value)
if value == count then
return
end
if value < 0 then
count = 0
elseif value > selectEquipTreasureData.num then
count = selectEquipTreasureData.num
else
count = value
end
this.slider.value = count*1.00/selectEquipTreasureData.num
function this:SetCount(value)
count = value
this.slider.value = value
this.bodyText.text=string.format("出售%s个%s",count,selectEquipTreasureData.itemConfig.Name)
end
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
@ -33,9 +24,9 @@ function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.bodyText=Util.GetGameObject(gameObject,"BodyText"):GetComponent("Text")
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
this.addBtn=Util.GetGameObject(gameObject,"slider/add")
this.reduceBtn=Util.GetGameObject(gameObject,"slider/reduce")
this.slider=Util.GetGameObject(gameObject,"slider"):GetComponent("Slider")
this.addBtn=Util.GetGameObject(gameObject,"add")
this.reduceBtn=Util.GetGameObject(gameObject,"reduce")
this.slider=Util.GetGameObject(gameObject,"Slider"):GetComponent("Slider")
--滚动条根节点
this.root = Util.GetGameObject(gameObject, "Root")
end
@ -57,6 +48,9 @@ function this.SendBackResolveReCallBack(drop)
else
BagManager.OnShowTipDropNumZero(drop)
end
if func then
func()
end
this:ClosePanel()
end
@ -65,8 +59,13 @@ function this:BindEvent()
parent:ClosePanel()
end)
Util.AddClick(this.confirmBtn,function()
if selectEquipTreasureData.itemConfig.Quantity>=4 then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel,2,selectEquipTreasureData.itemConfig.ItemBaseType,selectEquipTreasureData)
if count == 0 then
PopupTipPanel.ShowTip("出售数量不可为0个")
return
end
if selectEquipTreasureData.itemConfig.Quantity >= 4 then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel,2,selectEquipTreasureData.itemConfig.ItemBaseType,selectEquipTreasureData,function() end,count)
parent:ClosePanel()
else
local curResolveAllItemList={}
local equip = {}
@ -100,8 +99,9 @@ function this:OnShow(_parent,...)
this.titleText.text="出售装备"
local equip = args[1]
func = args[2]
selectEquipTreasureData = BagManager.GetItemById(equip.id)
count = this:SetCount(selectEquipTreasureData.num)
this:SetCount(selectEquipTreasureData.num)
if not itemList or #itemList < 1 then
local item = SubUIManager.Open(SubUIConfig.ItemView, this.root.transform)
table.insert(itemList,item)
@ -109,8 +109,10 @@ function this:OnShow(_parent,...)
itemList[1].gameObject:SetActive(true)
itemList[1]:OnOpen(false,{selectEquipTreasureData.id,selectEquipTreasureData.num},1,true,false)
this.slider.maxValue = selectEquipTreasureData.num
this.slider.value = selectEquipTreasureData.num
this.slider.onValueChanged:AddListener(function()
this:SetCount(math.floor(this.slider.value * selectEquipTreasureData.num))
this:SetCount(this.slider.value)
end)
end

View File

@ -11,11 +11,13 @@ local dropList = {}
local itemList = {}
--传入选择英雄
local selectEquipTreasureData
local selectEquipTreasureDataDid
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.bodyText=Util.GetGameObject(gameObject,"BodyText"):GetComponent("Text")
this.tipText=Util.GetGameObject(gameObject,"tipText"):GetComponent("Text")
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
@ -27,23 +29,35 @@ function this:BindEvent()
Util.AddClick(this.cancelBtn,function()
parent:ClosePanel()
end)
Util.AddClick(this.confirmBtn,function()
-- local data={}
-- for k,v in pairs(selectEquipTreasureData) do
-- table.insert(data,v.idDyn)
-- end
-- NetManager.UseAndPriceItemRequest(4, data, function(msg)
-- for i = 1, #data do
-- EquipTreasureManager.RemoveTreasureByIdDyn(data[i])
-- end
-- parent:ClosePanel()
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
-- ResolvePanel.SwitchView(3)
-- end)
-- end)
end)
Util.AddClick(this.confirmBtn,function()
NetManager.UseAndPriceItemRequest(4,selectEquipTreasureDataDid,function (drop)
this.SendBackResolveReCallBack(drop)
end)
end)
end
function this.SendBackResolveReCallBack(drop)
local isShowReward=false
if drop.itemlist~=nil and #drop.itemlist>0 then
for i = 1, #drop.itemlist do
if drop.itemlist[i].itemNum>0 then
isShowReward=true
break
end
end
end
if isShowReward then
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
BagManager.OnShowTipDropNumZero(drop)
end)
else
BagManager.OnShowTipDropNumZero(drop)
end
for k, v in ipairs(selectEquipTreasureDataDid) do
EquipTreasureManager.RemoveTreasureByIdDyn(v)
end
ResolvePanel.SwitchView(3)
parent:ClosePanel()
end
function this:AddListener()
end
@ -57,10 +71,20 @@ function this:OnShow(_parent,...)
dropList = args[1]
selectEquipTreasureData=args[2]
this.titleText.text=Language[11643]
this.titleText.text="宝物分解"
--返还比
local num = 100--tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100
this.bodyText.text=string.format( Language[11644],num,"%")
local isEquipShowSure = false
selectEquipTreasureDataDid = {}
local data = {}
for k, v in pairs(selectEquipTreasureData) do
table.insert(selectEquipTreasureDataDid,k)
if v.quantity>=4 then
isEquipShowSure=true
end
end
this.bodyText.text=Language[10205]
this.bodyText.gameObject:SetActive(isEquipShowSure)
this.tipText.text = "分解后获得:"
local data={}
for i, v in pairs(dropList) do

View File

@ -69,16 +69,19 @@ function EquipSellSelectPopup:BindEvent()
local qualityList = {}
local starList = {}
for i=1,#quaStateTable do
LogBlue(tostring(quaStateTable[i]))
if quaStateTable[i] then
qualityList[i + 1] = i + 1
end
end
for i=1,#starStateTable do
LogBlue(tostring(starStateTable[i]))
if starStateTable[i] then
starList[i] = i
end
end
local data = BagManager.GetEquipDataByEquipQualityAndStar(qualityList,starList)
if #data < 1 then
PopupTipPanel.ShowTip("没有满足条件的装备")
return
end
self:ClosePanel()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.EquipBatchSell,

View File

@ -49,9 +49,6 @@ function this:BindEvent()
this.QuickSelectListData(2)
this.noSelectBtn.gameObject:SetActive(false)
end)
Util.AddClick(this.confirmBtn, function()
--this.ResolveBtnClickEvent()
end)
Util.AddClick(this.shopBtn, function()
local isActive, errorTip = ShopManager.IsActive(SHOP_TYPE.SOUL_CONTRACT_SHOP)
if not isActive then

View File

@ -51,9 +51,6 @@ function this:BindEvent()
this.QuickSelectListData(2)
this.noSelectBtn.gameObject:SetActive(false)
end)
Util.AddClick(this.confirmBtn, function()
--this.ResolveBtnClickEvent()
end)
end
function this:AddListener()