Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化

dev_chengFeng
ZhangBiao 2020-12-28 17:07:30 +08:00
commit 9f3560471c
7 changed files with 362 additions and 108 deletions

View File

@ -3714,7 +3714,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &677243167307156643
RectTransform:
m_ObjectHideFlags: 0
@ -3731,9 +3731,9 @@ RectTransform:
m_Father: {fileID: 396553229042369325}
m_RootOrder: 6
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 928.65, y: -82}
m_SizeDelta: {x: 184, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5858770910401139525
@ -9068,7 +9068,7 @@ ParticleSystem:
--- !u!199 &8784777500139318308
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14172,7 +14172,7 @@ ParticleSystem:
--- !u!199 &6409678742855279415
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19299,7 +19299,7 @@ ParticleSystem:
--- !u!199 &5134806021683923440
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24344,7 +24344,7 @@ ParticleSystem:
--- !u!199 &8594092854800795284
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29126,7 +29126,7 @@ ParticleSystem:
--- !u!199 &5592400397920860441
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30596,7 +30596,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7279\u6B8A"
m_Text: "\u4E00\u822C"
LanguageIndex: 10136
--- !u!1 &6155690386676375112
GameObject:

View File

@ -2036,8 +2036,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 357.7, y: -0.0000022451}
m_SizeDelta: {x: 160, y: 97}
m_AnchoredPosition: {x: 397.2, y: -0.0000022451}
m_SizeDelta: {x: 81, y: 97}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222484165078375402
CanvasRenderer:
@ -2569,7 +2569,7 @@ GameObject:
- component: {fileID: 222098663230714270}
- component: {fileID: 4194478678223721100}
m_Layer: 5
m_Name: numText
m_Name: numText1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

View File

@ -4707,7 +4707,7 @@ ParticleSystem:
--- !u!199 &199913150007694034
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5823,7 +5823,7 @@ RectTransform:
m_Children:
- {fileID: 8520713797459513064}
m_Father: {fileID: 224358324289722092}
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}
@ -6118,6 +6118,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 0.95, z: 1}
m_Children:
- {fileID: 4439132398780520808}
- {fileID: 224903305027616404}
- {fileID: 5547263014786898986}
- {fileID: 6899818899209617428}
@ -6129,8 +6130,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.049988, y: -765.51953}
m_SizeDelta: {x: 1080.1, y: 164}
m_AnchoredPosition: {x: -0.0057868958, y: -765.51953}
m_SizeDelta: {x: 1136.8, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222414397184224872
CanvasRenderer:
@ -12391,7 +12392,7 @@ ParticleSystem:
--- !u!199 &199808684316966162
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -13051,7 +13052,7 @@ RectTransform:
m_Children:
- {fileID: 1603168194977039713}
m_Father: {fileID: 224358324289722092}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -17969,7 +17970,7 @@ ParticleSystem:
--- !u!199 &3852268799559907720
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -22747,7 +22748,7 @@ ParticleSystem:
--- !u!199 &5271325450925093107
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -27562,7 +27563,7 @@ ParticleSystem:
--- !u!199 &3183714690231709786
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32666,7 +32667,7 @@ ParticleSystem:
--- !u!199 &1743651251639927205
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37422,7 +37423,7 @@ ParticleSystem:
--- !u!199 &7475280723313167660
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42178,7 +42179,7 @@ ParticleSystem:
--- !u!199 &9150494766190968901
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -46912,7 +46913,7 @@ ParticleSystem:
--- !u!199 &7199790129551958231
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51668,7 +51669,7 @@ ParticleSystem:
--- !u!199 &5940030307403993872
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51759,7 +51760,7 @@ RectTransform:
m_Children:
- {fileID: 1190666732310579906}
m_Father: {fileID: 224358324289722092}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -51998,9 +51999,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -302.2, y: -1733.6}
m_AnchoredPosition: {x: -2398, y: -1951}
m_SizeDelta: {x: 170.7, y: 97.72}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8815997685655610939
CanvasRenderer:
m_ObjectHideFlags: 0
@ -56777,7 +56778,7 @@ ParticleSystem:
--- !u!199 &8744724081048752083
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61767,7 +61768,7 @@ ParticleSystem:
--- !u!199 &4790988713032616438
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61918,7 +61919,7 @@ RectTransform:
m_Children:
- {fileID: 6146690413383192355}
m_Father: {fileID: 224358324289722092}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -66988,7 +66989,7 @@ ParticleSystem:
--- !u!199 &7601660874278259845
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -71853,7 +71854,7 @@ ParticleSystem:
--- !u!199 &3734719174028801100
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -76587,7 +76588,7 @@ ParticleSystem:
--- !u!199 &7852783147755868435
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -76783,7 +76784,7 @@ RectTransform:
m_Children:
- {fileID: 4436105112800055539}
m_Father: {fileID: 224358324289722092}
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}
@ -81646,7 +81647,7 @@ ParticleSystem:
--- !u!199 &5795776126709631377
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -86402,7 +86403,7 @@ ParticleSystem:
--- !u!199 &645669681233002935
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -91158,7 +91159,7 @@ ParticleSystem:
--- !u!199 &3025146004537813439
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -95979,7 +95980,7 @@ ParticleSystem:
--- !u!199 &5065274489376317798
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -100927,7 +100928,7 @@ ParticleSystem:
--- !u!199 &1063978642119183846
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -105718,7 +105719,7 @@ ParticleSystem:
--- !u!199 &4577166716739436122
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -110620,7 +110621,7 @@ ParticleSystem:
--- !u!199 &521858604409485964
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -110679,6 +110680,102 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &5496797374293030386
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3348237116204106447}
- component: {fileID: 6286969031280940214}
- component: {fileID: 4259625365623119525}
- component: {fileID: 3696090905681236387}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3348237116204106447
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496797374293030386}
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: 4439132398780520808}
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: -0.0000023842, y: 3.515}
m_SizeDelta: {x: 155.92, y: 77.47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6286969031280940214
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496797374293030386}
m_CullTransparentMesh: 0
--- !u!114 &4259625365623119525
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496797374293030386}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &3696090905681236387
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496797374293030386}
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.65882355, g: 0.65882355, b: 0.654902, 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: 48
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 52
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5168\u90E8"
LanguageIndex: 11543
--- !u!1 &5649126956949771540
GameObject:
m_ObjectHideFlags: 0
@ -110947,6 +111044,124 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u9B42\u5B9D"
LanguageIndex: 11345
--- !u!1 &5898298760797010530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4439132398780520808}
- component: {fileID: 3088020878196394035}
- component: {fileID: 4983553448174617697}
- component: {fileID: 8749598696640232934}
m_Layer: 5
m_Name: Btn0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4439132398780520808
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5898298760797010530}
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: 3348237116204106447}
m_Father: {fileID: 224358324289722092}
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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3088020878196394035
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5898298760797010530}
m_CullTransparentMesh: 0
--- !u!114 &4983553448174617697
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5898298760797010530}
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: fa798c27aa39c5944bac5d1f8a401cfe, 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 &8749598696640232934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5898298760797010530}
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: 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: 4983553448174617697}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5909197083985721636
GameObject:
m_ObjectHideFlags: 0
@ -110979,7 +111194,7 @@ RectTransform:
m_Children:
- {fileID: 2044725584361218275}
m_Father: {fileID: 224358324289722092}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -115959,7 +116174,7 @@ ParticleSystem:
--- !u!199 &3013826695847252014
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -120715,7 +120930,7 @@ ParticleSystem:
--- !u!199 &413717427226994198
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -125546,7 +125761,7 @@ ParticleSystem:
--- !u!199 &388545298818640071
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -130302,7 +130517,7 @@ ParticleSystem:
--- !u!199 &4120970463321800302
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -135036,7 +135251,7 @@ ParticleSystem:
--- !u!199 &7717983067442452609
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -140091,7 +140306,7 @@ ParticleSystem:
--- !u!199 &2287083752582572032
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -140185,7 +140400,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.0000023842, y: 3.515}
m_AnchoredPosition: {x: 0, y: 3.5149994}
m_SizeDelta: {x: 155.92, y: 77.47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3727180129914429543
@ -144943,7 +145158,7 @@ ParticleSystem:
--- !u!199 &1755222855953066752
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -149641,7 +149856,7 @@ ParticleSystem:
--- !u!199 &8370477990178466979
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -154493,7 +154708,7 @@ ParticleSystem:
--- !u!199 &6004082643824602778
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -159363,7 +159578,7 @@ ParticleSystem:
--- !u!199 &2598195503796815680
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -164198,7 +164413,7 @@ ParticleSystem:
--- !u!199 &8828901401956282593
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -168932,7 +169147,7 @@ ParticleSystem:
--- !u!199 &5648459871644747481
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -173800,7 +174015,7 @@ ParticleSystem:
--- !u!199 &7148827205064525326
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -178556,7 +178771,7 @@ ParticleSystem:
--- !u!199 &3981746168289052076
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -183424,7 +183639,7 @@ ParticleSystem:
--- !u!199 &4752419209397002737
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -188355,7 +188570,7 @@ ParticleSystem:
--- !u!199 &3843098992673722736
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -195823,7 +196038,7 @@ ParticleSystem:
--- !u!199 &4527856640657632424
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -200614,7 +200829,7 @@ ParticleSystem:
--- !u!199 &4712161909095197685
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -205444,7 +205659,7 @@ ParticleSystem:
--- !u!199 &1704248638401735114
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -298,6 +298,21 @@ function this.GetBagItemDataByItemType(_itemType)
return items
end
--通过物品类型获得物品list
function this.GetBagItemDataByItemTypeV2(_itemType,_itemType1)
local items = {}
local index = 1
--LogError("_itemType ".._itemType)
for i, v in pairs(this.bagDatas) do
--LogError(v.itemConfig.Name.." ".._itemType.." "..v.type.." "..v.num)
if (v.type == _itemType or v.type == _itemType1) and v.num > 0 and v.itemConfig.BackpackOrNot then
items[index] = v
index = index + 1
end
end
return items
end
--通过物品类型获得物品list
function this.GetItemDataByItemType(_itemType)
local items = {}

View File

@ -67,12 +67,10 @@ function BagPanel:BindEvent()
Util.AddClick(tabs1[i], function()
if this.isFristOpen == false then
if i == sortIndex then
sortIndex = 0
this:OnClickAllBtn()
else
sortIndex = i
this.OnClickTabBtn(sortIndex, tabs1[sortIndex])
return
end
sortIndex = i
this.OnClickTabBtn(sortIndex, tabs1[sortIndex])
end
end)
end
@ -129,26 +127,26 @@ function this:SetSelectBtn(_btn)
this.itemNumText:SetActive(sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.SoulPrint or sortIndex == ItemBaseType.EquipTreasure)--装备 法宝
end
--点击全部按钮
function this:OnClickAllBtn()
sortIndex = 0
this:SetSelectBtn(tabs1[sortIndex])
sortIndexBtnGo = tabs1[sortIndex]
itemData = {}
itemData = this.GetBagItemData()
local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures()
for i = 1, #curAllEquipTreasure do
table.insert(itemData, curAllEquipTreasure[i])
end
local soulPrintData = BagManager.GetAllSoulPrintData()
for i,v in ipairs(soulPrintData) do
table.insert(itemData, v)
end
-- --点击全部按钮
-- function this:OnClickAllBtn()
-- sortIndex = 0
-- this:SetSelectBtn(tabs1[sortIndex])
-- sortIndexBtnGo = tabs1[sortIndex]
-- itemData = {}
-- itemData = this.GetBagItemData()
-- local curAllEquipTreasure = EquipTreasureManager.GetAllTreasures()
-- for i = 1, #curAllEquipTreasure do
-- table.insert(itemData, curAllEquipTreasure[i])
-- end
-- local soulPrintData = BagManager.GetAllSoulPrintData()
-- for i,v in ipairs(soulPrintData) do
-- table.insert(itemData, v)
-- end
this:SetItemData(itemData)
this.noneImage:SetActive(#itemData==0)
-- this:SetItemData(itemData)
-- this.noneImage:SetActive(#itemData==0)
end
-- end
function this.BagGoldChangeCallBackOnClickTabBtn()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
end
@ -167,8 +165,8 @@ function this.OnClickTabBtn(_index, _clickBtn)
end
itemNumText.text = Language[10188]..allEquipNum.."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit
this:SetItemData(itemData)
elseif _index == 0 then
this:OnClickAllBtn()
-- elseif _index == 0 then
-- this:OnClickAllBtn()
elseif (_index == ItemBaseType.SoulPrint) then
itemData = BagManager.GetAllSoulPrintData()
itemNumText.text = Language[10189]..#itemData.."/"..specialConfig[9].Value
@ -177,6 +175,9 @@ function this.OnClickTabBtn(_index, _clickBtn)
itemData = EquipTreasureManager.GetAllTreasures()
itemNumText.text = Language[10190]..LengthOfTable(itemData).."/"..specialConfig[10].Value
this:SetItemData(itemData)
elseif (_index == ItemBaseType.Special) then
itemData = BagManager.GetBagItemDataByItemTypeV2(ItemBaseType.Special,ItemBaseType.Materials)
this:SetItemData(itemData)
else
itemData = BagManager.GetBagItemDataByItemType(_index)
this:SetItemData(itemData)
@ -194,7 +195,7 @@ local orginLayer2 = 0
--设置背包列表数据
function this:SetItemData(_itemDatas)
list={}
this.ItemsSortData(_itemDatas)
this.ItemsSortDataV2(_itemDatas)
if not this.ScrollView then
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.transform, "scroll").transform,
@ -493,7 +494,7 @@ end
--界面打开时调用(用于子类重写)
function BagPanel:OnOpen(_sortIndex)
sortIndex = 0--注释掉就是记录选择类型
sortIndex = 1--注释掉就是记录选择类型
if _sortIndex then
sortIndex = _sortIndex
end
@ -511,8 +512,8 @@ function BagPanel:OnShow()
end
if sortIndex > 0 then
this.OnClickTabBtn(sortIndex, tabs1[sortIndex])
else
this:OnClickAllBtn()
-- else
-- this:OnClickAllBtn()
end
SoundManager.PlayMusic(SoundConfig.BGM_Main)
BagManager.isBagPanel = true
@ -605,6 +606,17 @@ function this.DelePokemonItemData(_itemDatas)
end
return curItemDatas
end
function this.ItemsSortDataV2(_itemDatas)
table.sort(_itemDatas, function(a, b)
if a.itemConfig.Sort == b.itemConfig.Sort then
return a.itemConfig.Id < b.itemConfig.Id
else
return a.itemConfig.sort < b.itemConfig.sort
end
end)
end
--弃用
function this.ItemsSortData(_itemDatas)
--排序
table.sort(_itemDatas, function(a, b)

View File

@ -45,7 +45,8 @@ function BagResolveAnCompoundPanel:InitComponent()
this.propertyIma =Util.GetGameObject(self.gameObject, "bg/layout3/property")
this.icon=Util.GetGameObject(self.gameObject, "bg/layout3/icon"):GetComponent("Image")
this.Slider=Util.GetGameObject(self.gameObject, "bg/layout3/Slider")--:GetComponent("Slider")
this.numText=Util.GetGameObject(self.gameObject, "bg/layout3/Slider/numText"):GetComponent("Text")
this.numText=Util.GetGameObject(self.gameObject, "bg/layout3/Slider/numText1"):GetComponent("Text")
this.numText1=Util.GetGameObject(self.gameObject, "bg/layout3/Slider/numText"):GetComponent("Text")
this.resolveName=Util.GetGameObject(self.gameObject, "bg/layout3/name"):GetComponent("Text")
this.addBtn=Util.GetGameObject(self.gameObject, "bg/layout3/addBtn")
this.jianBtn=Util.GetGameObject(self.gameObject, "bg/layout3/jianBtn")
@ -425,11 +426,15 @@ function this.ShowCompoundNumData(value)
compoundNum=value
this.Slider:GetComponent("Slider").value=value
if itemData.itemConfig.ItemType==ItemType.HeroDebris then--碎片
this.numText1.gameObject:SetActive(true)
this.numText.text= Language[10216]..value*itemData.itemConfig.UsePerCount..Language[10217]..value..Language[10218].. string.gsub(itemData.itemConfig.Name,Language[10219],"")
this.numText1.text = value
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
this.numText.text= Language[10220]..value..Language[10218]..itemData.itemConfig.Name..""
this.numText1.gameObject:SetActive(false)
else
this.numText.text= Language[10213]..value..Language[10218]..itemData.itemConfig.Name..""
this.numText1.gameObject:SetActive(false)
end
end
--界面关闭时调用(用于子类重写)

View File

@ -32,7 +32,14 @@ local heroListData
local curSelectEquipData
local index
local indexBtnNum = 0
local typeTab = {Language[10427], Language[10428], Language[10429], Language[10430], Language[10505], Language[10506]}
local typeTab = {
[0] = "全部",
[1] = Language[10427],
[2] = Language[10428],
[3] = Language[10429],
[4] = Language[10430],
[5] = Language[10505],
[6] = Language[10506]}
local tabs = {}
local openThisPanel
local effectList = {}
@ -176,12 +183,14 @@ function RoleEquipPanel:BindEvent()
function()
isPlayAnim = true
if i == indexBtnNum then
indexBtnNum = PosIdConst.All
return
end
indexBtnNum = i
if indexBtnNum == PosIdConst.All then
this:OnClickAllBtn()
else
indexBtnNum = i
this:OnClickTabBtn(indexBtnNum)
end
end
end
)
end
@ -682,14 +691,12 @@ function this.ShowHeroEquip()
end
function this:SetSelectBtn()
this.selectBtn:SetActive(indexBtnNum ~= PosIdConst.All)
if indexBtnNum ~= PosIdConst.All then
this.selectBtn.transform:SetParent(tabs[indexBtnNum].transform)
this.selectBtn.transform.localPosition = Vector3(0, -8, 0)
--this.selectBtn.transform.localScale = Vector3.one
--this.selectBtn:GetComponent("Image"):SetNativeSize()
Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = typeTab[indexBtnNum]
end
this.selectBtn:SetActive(true)
this.selectBtn.transform:SetParent(tabs[indexBtnNum].transform)
this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0)
--this.selectBtn.transform.localScale = Vector3.one
--this.selectBtn:GetComponent("Image"):SetNativeSize()
Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = typeTab[indexBtnNum]
end
--点击全部按钮
@ -783,7 +790,7 @@ function this:SetItemData(_itemDatas)
end
isFristOpenTime = Timer.New(function()
this.mask:SetActive(false)
end, 1):Start()
end, 0.3):Start()
this.mask:SetActive(true)
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false