Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/UIAssets/decorate/dec_juxing_yuanjiao16.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 21, y: 18, z: 18, w: 18}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -0,0 +1,717 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1023940617352225769
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8103003509539381039}
+  - component: {fileID: 5019445034691839695}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8103003509539381039
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1023940617352225769}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4406617497510563232}
+  - {fileID: 1541316921576123231}
+  - {fileID: 7957917780475828645}
+  - {fileID: 7166492067245868842}
+  - {fileID: 1825629934269939522}
+  m_Father: {fileID: 3555197382594190730}
+  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: 0}
+  m_SizeDelta: {x: 190, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5019445034691839695
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1023940617352225769}
+  m_CullTransparentMesh: 1
+--- !u!1 &1959513863254869355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3733190943918489209}
+  - component: {fileID: 8283882290397303097}
+  - component: {fileID: 6627819404544753613}
+  - component: {fileID: 567857318717818508}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3733190943918489209
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959513863254869355}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1825629934269939522}
+  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: 4, y: 13.556}
+  m_SizeDelta: {x: 45.5871, y: 169.8883}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8283882290397303097
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959513863254869355}
+  m_CullTransparentMesh: 1
+--- !u!114 &6627819404544753613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959513863254869355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u83B2\u82B1\u5B88\u5FC3\u706F"
+--- !u!114 &567857318717818508
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959513863254869355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.10980393, g: 0.39607847, b: 0.627451, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &2228955867083360576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7957917780475828645}
+  - component: {fileID: 3323885914582972465}
+  - component: {fileID: 4361466827399270368}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_SuiPian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7957917780475828645
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2228955867083360576}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8103003509539381039}
+  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: -22.8, y: -96.8}
+  m_SizeDelta: {x: 27, y: 32}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3323885914582972465
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2228955867083360576}
+  m_CullTransparentMesh: 1
+--- !u!114 &4361466827399270368
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2228955867083360576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_chouka_suipian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  packInfo:
+    packName: chouka
+    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
+    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
+    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3820391084866158623
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4406617497510563232}
+  - component: {fileID: 1833072991503158903}
+  - component: {fileID: 4403429717373536355}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_quality
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4406617497510563232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3820391084866158623}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8103003509539381039}
+  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: 0}
+  m_SizeDelta: {x: 190, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1833072991503158903
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3820391084866158623}
+  m_CullTransparentMesh: 1
+--- !u!114 &4403429717373536355
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3820391084866158623}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ka1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  packInfo:
+    packName: chouka
+    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
+    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
+    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4163252131795746410
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1541316921576123231}
+  - component: {fileID: 2409181130061510914}
+  - component: {fileID: 8725859952368040408}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1541316921576123231
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163252131795746410}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8103003509539381039}
+  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: 4.5, y: 7.1}
+  m_SizeDelta: {x: 148.2813, y: 161.7614}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2409181130061510914
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163252131795746410}
+  m_CullTransparentMesh: 1
+--- !u!114 &8725859952368040408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163252131795746410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_fb_3302
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4548610688968960948
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1825629934269939522}
+  - component: {fileID: 6121373831388959596}
+  - component: {fileID: 4374769721145548101}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1825629934269939522
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4548610688968960948}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3733190943918489209}
+  m_Father: {fileID: 8103003509539381039}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: -25.2, y: 14.5}
+  m_SizeDelta: {x: 59, y: 226}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &6121373831388959596
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4548610688968960948}
+  m_CullTransparentMesh: 1
+--- !u!114 &4374769721145548101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4548610688968960948}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_chouka_textdi1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  packInfo:
+    packName: chouka
+    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
+    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
+    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5828464522225353660
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3555197382594190730}
+  - component: {fileID: 7164015632971998754}
+  - component: {fileID: 2867608603011516750}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: WidgetItemType2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3555197382594190730
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5828464522225353660}
+  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_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 8103003509539381039}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 255, y: 1333}
+  m_SizeDelta: {x: 190, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7164015632971998754
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5828464522225353660}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: bg
+    gameObject: {fileID: 4403429717373536355}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon
+    gameObject: {fileID: 8725859952368040408}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Count
+    gameObject: {fileID: 4035756139084935713}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_WidgetItem
+    gameObject: {fileID: 2867608603011516750}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_quality
+    gameObject: {fileID: 4403429717373536355}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 6627819404544753613}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_SuiPian
+    gameObject: {fileID: 4361466827399270368}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &2867608603011516750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5828464522225353660}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &9204525041625646555
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7166492067245868842}
+  - component: {fileID: 1507516687379950841}
+  - component: {fileID: 4035756139084935713}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Count
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7166492067245868842
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9204525041625646555}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8103003509539381039}
+  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: 25.4, y: -96.8}
+  m_SizeDelta: {x: 53.29, y: 35.3449}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1507516687379950841
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9204525041625646555}
+  m_CullTransparentMesh: 1
+--- !u!114 &4035756139084935713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9204525041625646555}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.21176472, g: 0.20000002, b: 0.18039216, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: x10

Assets/Res/UI/BoxPanel/WidgetItemType2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHwZti6tVSi+AzMyBSpmUO/eBw5+nnt+6MvSSuxifgoBYznuBQlB5pwITVZ/
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/BoxPanel/抽卡-10连.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Dn9J4y2sVS9ne7grBbYFSdvAskCyEqDbHMJQRLSc/24cBjjiH5IRGI3Y5YkY
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/BoxPanel/抽卡-进入.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: B3xJtn/7BnjYu/vrYUj0loju6+g7TJROAjfA9KrjD20ipK6D6OU3l6XDry20
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -190,6 +190,7 @@ namespace GameLogic.Player
 
                     allIitem.AddRange(addItem);
                     summonData.baodiCount1 = 0;
+                    summonData.baodiCount2++;
 
                     foreach (var baodiItem in baodiItems)
                     {
@@ -302,7 +303,7 @@ namespace GameLogic.Player
 
 
         // 检查单次十连是否满足成就条件
-        private bool CheckSingleDraw(OpenBoxScoreRule openBoxScoreRule, List<int> drawResult)
+        public bool CheckSingleDraw(OpenBoxScoreRule openBoxScoreRule, List<int> drawResult)
         {
             // 统计符合条件的道具数量
             int validItemCount = 0;

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -18,7 +18,8 @@ namespace Fort23.Mono
             AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[configId];
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(configId);
             //有免费次数，并且让到时间了就免费抽
-            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
+                PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
                 return PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
@@ -42,7 +43,8 @@ namespace Fort23.Mono
             AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[configId];
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(configId);
             //有免费次数，并且让到时间了就免费抽
-            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
+                PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
                 return PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
@@ -70,7 +72,7 @@ namespace Fort23.Mono
 
         public static async void OpenBoxPanel()
         {
-            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Middle, isShowBG: true);
+            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Middle);
             boxPanel.OpenPanel();
         }
 
@@ -83,6 +85,7 @@ namespace Fort23.Mono
         public override CTask GetFocus()
         {
             // AppBarPanel.ClosePanel();
+            TitlePanel.OpenPanel(new List<int>() { openBoxConfig.CostItemID });
             return base.GetFocus();
         }
 
@@ -101,43 +104,8 @@ namespace Fort23.Mono
             Btn_Score.onClick.AddListener(() => { OpenBoxScorePanel.OpenPanel(); });
             oneButton.onClick.AddListener(OnButtonCallBack);
             tenButton.onClick.AddListener(TenButtonCallBack);
-            close.onClick.AddListener(CloseButtonCallBack);
+            Btn_Close.onClick.AddListener(CloseButtonCallBack);
             bg.onClick.AddListener(CloseButtonCallBack);
-            Btn_AdsFree.onClick.AddListener(async () =>
-            {
-                if (AccountFileInfo.Instance.playerData.boxFree)
-                {
-                    TipMessagePanel.OpenTipMessagePanel(938, Vector2.zero);
-                    return;
-                }
-
-                if (isStartAd)
-                    return;
-                isStartAd = true;
-
-                var dic = new Dictionary<string, string>();
-                dic.Add("Chouka", "");
-                // YouLoftSDK.Instance.CustomEvent("OnclickAds", dic);
-                // bool isOK = await YouLoftSDK.Instance.ShowAd();
-                bool isOK = true;
-                isStartAd = false;
-
-                if (!isOK)
-                {
-                    return;
-                }
-
-                dic = new Dictionary<string, string>();
-                dic.Add("Chouka", "");
-                // YouLoftSDK.Instance.CustomEvent("AdsPlayOver", dic);
-                AccountFileInfo.Instance.playerData.boxFree = true;
-                AccountFileInfo.Instance.SavePlayerData();
-                // Btn_AdsFree.gameObject.SetActive(false);
-
-                List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID, true);
-                if (allIitem != null)
-                    GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
-            });
         }
 
 
@@ -148,7 +116,7 @@ namespace Fort23.Mono
                 TipMessagePanel.OpenTipMessagePanel("已经开启300抽挑战，不能进行单抽了");
                 return;
             }
-            
+
             //测试代码
             List<ItemInfo> allIitem = await BoxHelper.OneBox(openBoxConfig.ID);
             if (allIitem != null)
@@ -189,6 +157,7 @@ namespace Fort23.Mono
             Icon_TenItem.icon_name = config.icon;
             onCion.text = "x" + openBoxConfig.oneConsume;
             tenCion.text = "x" + openBoxConfig.tenConsume;
+            Slider_Count.maxValue = openBoxConfig.reward2para1;
             UpdateUi();
         }
 
@@ -197,7 +166,8 @@ namespace Fort23.Mono
         {
             if (summonData == null)
                 return;
-            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime < summonData.nextTenFreeTime)
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
+                PlayerManager.Instance.serverTime < summonData.nextTenFreeTime)
             {
                 int time = (int)(summonData.nextTenFreeTime - PlayerManager.Instance.serverTime);
                 Text_TenFree.text = PlayerManager.TimeToHSM(time / 1000);
@@ -218,7 +188,8 @@ namespace Fort23.Mono
                 }
             }
 
-            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
+                PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
             {
                 int time = (int)(summonData.nextOneFreeTime - PlayerManager.Instance.serverTime);
                 Text_OneFree.text = PlayerManager.TimeToHSM(time / 1000);
@@ -244,8 +215,12 @@ namespace Fort23.Mono
         {
             summonData = PlayerManager.Instance.SummonManager.summonDataMap[openBoxConfig.ID];
 
+            Slider_Count.value = summonData.baodiCount2;
+            Text_Count.text = $"{summonData.baodiCount2}/{openBoxConfig.reward2para1}";
+
 
-            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
+                PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
                 Text_TenFree.gameObject.SetActive(false);
                 tenCion.text = "免费";
@@ -263,7 +238,8 @@ namespace Fort23.Mono
                 tenCion.text = "x" + openBoxConfig.tenConsume;
             }
 
-            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
+                PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
                 Text_OneFree.gameObject.SetActive(false);
                 onCion.text = "免费";

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanelData.cs

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _bg;
 	     }
 	   }
-	  private Button _close;
-	  public Button close
-	   {
-	   get{
-	      if (_close == null)
-	       {
-	         _close  = GetUIUnit<Button>("close"); 
-	       }
-	      return _close;
-	     }
-	   }
 	  private Button _oneButton;
 	  public Button oneButton
 	   {
@@ -74,13 +63,13 @@ namespace Fort23.Mono
 	      return _onCion;
 	     }
 	   }
-	  private Button _Btn_AdsFree;
-	  public Button Btn_AdsFree
+	  private Object _Btn_AdsFree;
+	  public Object Btn_AdsFree
 	   {
 	   get{
 	      if (_Btn_AdsFree == null)
 	       {
-	         _Btn_AdsFree  = GetUIUnit<Button>("Btn_AdsFree"); 
+	         _Btn_AdsFree  = GetUIUnit<Object>("Btn_AdsFree"); 
 	       }
 	      return _Btn_AdsFree;
 	     }
@@ -140,6 +129,39 @@ namespace Fort23.Mono
 	      return _Btn_Score;
 	     }
 	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Slider _Slider_Count;
+	  public Slider Slider_Count
+	   {
+	   get{
+	      if (_Slider_Count == null)
+	       {
+	         _Slider_Count  = GetUIUnit<Slider>("Slider_Count"); 
+	       }
+	      return _Slider_Count;
+	     }
+	   }
+	  private Text _Text_Count;
+	  public Text Text_Count
+	   {
+	   get{
+	      if (_Text_Count == null)
+	       {
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
+	       }
+	      return _Text_Count;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -22,9 +22,6 @@ namespace Fort23.Mono
 
         private OpenBoxConfig _openBoxConfig;
 
-        List<GameObjectPool> _gameObjectPools = new List<GameObjectPool>();
-
-        List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
 
         private AccountFileInfo.SummonData SummonData;
 
@@ -38,7 +35,8 @@ namespace Fort23.Mono
         public override CTask GetFocus()
         {
             AppBarPanel.ClosePanel();
-            TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
+            TitlePanel.ClosePanel();
+            // TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
             return base.GetFocus();
         }
 
@@ -60,48 +58,15 @@ namespace Fort23.Mono
         {
             tenButton.onClick.AddListener(() =>
             {
-                float beLv = Utility.UtilTools.GetRandomByWeight(_openBoxConfig.betPara1.ToList(), _openBoxConfig.betPara2);
-                
+                float beLv =
+                    Utility.UtilTools.GetRandomByWeight(_openBoxConfig.betPara1.ToList(), _openBoxConfig.betPara2);
+
                 foreach (var itemInfo in itemInfos)
                 {
                     ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
                 }
-                
-                UIManager.Instance.HideUIUIPanel<GachaPanel>();
-            });
-            oneButton.onClick.AddListener(async () =>
-            {
-                /*if (type == 1)
-                {
-                    itemInfos = await BoxHelper.OneBox(_openBoxConfig.ID);
-                }
-                else if (type == 2)
-                {
-                    itemInfos = await BoxHelper.TenBox(_openBoxConfig.ID);
-                }
-
-                if (itemInfos == null)
-                    return;
-                for (var i = 0; i < _imageMoveContainers.Count; i++)
-                {
-                    _imageMoveContainers[i].Dispose();
-                }
-
-                _imageMoveContainers.Clear();
-
-                tenButton.gameObject.SetActive(false);
-                oneButton.gameObject.SetActive(false);
-
-
-                for (var i = 0; i < widgetItems.Count; i++)
-                {
-                    widgetItems[i].SetActive(false);
-                    widgetItems[i].InitWidget(itemInfos[i]);
-                }
 
-                CusstomInit();*/
-                
                 UIManager.Instance.HideUIUIPanel<GachaPanel>();
             });
         }
@@ -113,37 +78,58 @@ namespace Fort23.Mono
             _openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>((int)uiData[2]);
 
             SummonData = PlayerManager.Instance.SummonManager.summonDataMap[_openBoxConfig.ID];
+            Slider_Count.maxValue = _openBoxConfig.reward2para1;
+            Slider_Count.value = SummonData.baodiCount2;
+            Text_Count.text = $"{SummonData.baodiCount2}/{_openBoxConfig.reward2para1}";
 
-            foreach (var widget in _energyWidgets)
-            {
-                UIManager.Instance.DormancyGComponent(widget);
-            }
 
-            // _energyWidgets.Clear();
-            // EnergyWidget energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            // energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
-            // _energyWidgets.Add(energyWidget);
-            // energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
-            // _energyWidgets.Add(energyWidget);
+            StartRoot.gameObject.SetActive(SummonData.isSummonSocre);
+            if (SummonData.isSummonSocre)
+            {
+                Text_JingDu.text = $"当前进度：{SummonData.drawHistory.Count}/{_openBoxConfig.ProgressRewardChoukaCount}";
+                Text_Score.text = $"目前得分：{SummonData.score}";
 
-            /*
-            if (type == 1)
+                OpenBoxScoreRule openBoxScoreRule = CheckAchievements(SummonData);
+                if (openBoxScoreRule.ID != 0)
+                {
+                    ScoreName.SetActive(true);
+                    Text_ScoreCount.text = $"+{openBoxScoreRule.score}";
+                }
+                else
+                {
+                      ScoreName.SetActive(false);
+                }
+                
+            }
+            else
             {
-                text_btnText.text = "开启一次";
-                Trxt_Cion.text = "x" + _openBoxConfig.oneConsume;
+                ScoreName.SetActive(false);
             }
-            else if (type == 2)
+
+            if (itemInfos.Count > 1)
             {
-                text_btnText.text = "开启十次";
-                Trxt_Cion.text = "x" + _openBoxConfig.tenConsume;
-            }*/
+                for (var i = 0; i < itemInfos.Count; i++)
+                {
+                    WidgetItemType2 widgetItem =
+                        await UIManager.Instance.CreateGComponentForObject<WidgetItemType2>(TenWidgetitems[i], null);
+                    widgetItem.InitWidget(itemInfos[i]);
+                }
+
+                TenRoot.gameObject.SetActive(true);
+                OneRoot.gameObject.SetActive(false);
+            }
 
-            foreach (var itemInfo in itemInfos)
+            if (itemInfos.Count == 1)
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GridItem, isActive: false);
-                widgetItem.InitWidget(itemInfo);
-                widgetItems.Add(widgetItem);
+                for (var i = 0; i < itemInfos.Count; i++)
+                {
+                    WidgetItemType2 widgetItem =
+                        await UIManager.Instance.CreateGComponentForObject<WidgetItemType2>(WidgetItemType2Gam, null);
+                    widgetItem.InitWidget(itemInfos[i]);
+                }
+
+                TenRoot.gameObject.SetActive(false);
+                OneRoot.gameObject.SetActive(true);
             }
 
 
@@ -151,102 +137,73 @@ namespace Fort23.Mono
         }
 
         private float timer = 0;
-        private List<ImageMoveContainer> _imageMoveContainers = new List<ImageMoveContainer>();
 
-        [CustomMethod(CustomMethodType.Update)]
-        public void Update()
-        {
-            foreach (var imageMoveContainer in _imageMoveContainers)
-            {
-                imageMoveContainer.RenderUpdateCallBack();
-            }
-        }
 
         public async CTask CusstomInit()
         {
-            foreach (var gameObjectPool in _gameObjectPools)
-            {
-                gameObjectPool.own.GetComponent<RectTransform>().anchoredPosition = transform.worldToLocalMatrix * fxpos.position;
-                UIManager.Instance.DormancyGComponent(gameObjectPool);
-            }
+            tenButton.gameObject.SetActive(true);
+        }
+        
+        
+              // 检查成就匹配
+        private OpenBoxScoreRule  CheckAchievements(AccountFileInfo.SummonData summonData)
+        {
+            List<OpenBoxScoreRule> openBoxScoreRuleList = PlayerManager.Instance.SummonManager.openBoxScoreRuleMap[summonData.id];
 
-            _gameObjectPools.Clear();
-            for (var i = 0; i < widgetItems.Count; i++)
+            List<OpenBoxScoreRule> daChengOpenBoxScoreRuleList = new List<OpenBoxScoreRule>();
+            foreach (var openBoxScoreRule in openBoxScoreRuleList)
             {
-                //animTween.Play("click", false);
-                fx_ui_box_click.gameObject.SetActive(true);
-                fx_ui_box_click.Play();
-                ImageMoveContainer imageMoveContainer = new ImageMoveContainer();
-                GameObjectPool gameObjectPool = null;
-                if (widgetItems[i].itemInfo.config.quality >= 1 && widgetItems[i].itemInfo.config.quality <= 3)
-                {
-                    gameObjectPool = await GObjectPool.Instance.FetchAsync<GameObjectPool>("fx_ui_box_click_1");
-                }
-                else if (widgetItems[i].itemInfo.config.quality > 3 && widgetItems[i].itemInfo.config.quality <= 5)
-                {
-                    gameObjectPool = await GObjectPool.Instance.FetchAsync<GameObjectPool>("fx_ui_box_click_2");
-                }
-                else
+                // 检查连续 Para0 次十连
+                if (summonData.drawHistory.Count < openBoxScoreRule.para0) continue;
+
+                bool allDrawsSatisfy = true;
+                // 检查最近 Para0 次十连是否都满足条件
+                for (int i = summonData.drawHistory.Count - openBoxScoreRule.para0; i < summonData.drawHistory.Count; i++)
                 {
-                    gameObjectPool = await GObjectPool.Instance.FetchAsync<GameObjectPool>("fx_ui_box_click_3");
+                    if (!PlayerManager.Instance.SummonManager.CheckSingleDraw(openBoxScoreRule, summonData.drawHistory[i].list))
+                    {
+                        allDrawsSatisfy = false;
+                        break;
+                    }
                 }
 
-                _gameObjectPools.Add(gameObjectPool);
-                gameObjectPool.own.transform.GetComponent<RectTransform>().anchoredPosition = transform.worldToLocalMatrix * fxpos.position;
-                gameObjectPool.own.transform.SetParent(this.transform);
-                Vector2 pos = transform.worldToLocalMatrix * fxpos.position;
-                Vector2 pos1 = transform.worldToLocalMatrix * (PosRoot[i] as RectTransform).position;
-                gameObjectPool.own.GetComponent<RectTransform>().anchoredPosition = pos;
-                // gameObjectPool.own.SetActive(true);
-                imageMoveContainer.AddACurve(pos, pos1, 0, 3f, gameObjectPool);
-                _imageMoveContainers.Add(imageMoveContainer);
-                int index = i;
-                TimerComponent.Instance.AddTimer(300, () =>
+                if (allDrawsSatisfy)
                 {
-                    fx_ui_box_click.gameObject.SetActive(false);
-                    widgetItems[index].SetActive(true);
-                    // widgetItems[index].PlayerAnim();
-                });
-                await TimerComponent.Instance.WaitAsync(180 + Random.Range(0, 100));
+                    daChengOpenBoxScoreRuleList.Add(openBoxScoreRule);
+                }
+            }
 
-                // await TimerComponent.Instance.WaitAsync(200);
+            if (daChengOpenBoxScoreRuleList.Count > 0)
+            {
+                int id = daChengOpenBoxScoreRuleList.Max(obsr => obsr.ID);
+                OpenBoxScoreRule openBoxScoreRule = ConfigComponent.Instance.Get<OpenBoxScoreRule>(id);
+                return openBoxScoreRule;
+          
             }
 
-            tenButton.gameObject.SetActive(true);
-            oneButton.gameObject.SetActive(true);
+            return default;
         }
 
         public override void Close()
         {
-            foreach (var widgetItem in widgetItems)
-            {
-                UIManager.Instance.DormancyGComponent(widgetItem);
-            }
+            // foreach (var widgetItem in widgetItems)
+            // {
+            //     UIManager.Instance.DormancyGComponent(widgetItem);
+            // }
+            //
+            // widgetItems.Clear();
 
-            widgetItems.Clear();
-            for (var i = 0; i < _imageMoveContainers.Count; i++)
-            {
-                _imageMoveContainers[i].Dispose();
-            }
 
-            _imageMoveContainers.Clear();
-            _gameObjectPools.Clear();
             tenButton.gameObject.SetActive(false);
-            oneButton.gameObject.SetActive(false);
-            foreach (var widget in _energyWidgets)
-            {
-                UIManager.Instance.DormancyGComponent(widget);
-            }
+            tenButton.gameObject.SetActive(false);
+            OneRoot.gameObject.SetActive(true);
 
-            _energyWidgets.Clear();
 
             //完成挑战过后自动打开挑战界面
             if (_openBoxConfig.ProgressRewardChoukaCount != -1 &&
                 SummonData.drawHistory.Count >= _openBoxConfig.ProgressRewardChoukaCount)
             {
-
                 OpenBoxScorePanel.OpenPanel();
-
             }
 
             base.Close();
@@ -254,10 +211,12 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(List<ItemInfo> itemInfos, int type, int configId)
         {
-            if (UIManager.Instance.GetComponent<GachaPanel>() == null || UIManager.Instance.GetComponent<GachaPanel>().IsClose)
+            if (UIManager.Instance.GetComponent<GachaPanel>() == null ||
+                UIManager.Instance.GetComponent<GachaPanel>().IsClose)
             {
-                GachaPanel gachaPanel = await UIManager.Instance.LoadAndOpenPanel<GachaPanel>(null, UILayer.Middle, uiData: new object[] { itemInfos, type, configId });
-                await TimerComponent.Instance.WaitAsync(300);
+                GachaPanel gachaPanel = await UIManager.Instance.LoadAndOpenPanel<GachaPanel>(null, UILayer.Middle,
+                    uiData: new object[] { itemInfos, type, configId }, isShowBG: true);
+                // await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }
         }

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanelData.cs

@@ -3,110 +3,141 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
-using Coffee.UIExtensions;
-
 namespace Fort23.Mono
 {
 	public partial class GachaPanel 
 	{
 	  #region 自定义数据 
-	  private Button _oneButton;
-	  public Button oneButton
+	  private Button _tenButton;
+	  public Button tenButton
 	   {
 	   get{
-	      if (_oneButton == null)
+	      if (_tenButton == null)
 	       {
-	         _oneButton  = GetUIUnit<Button>("oneButton"); 
+	         _tenButton  = GetUIUnit<Button>("tenButton"); 
 	       }
-	      return _oneButton;
+	      return _tenButton;
 	     }
 	   }
-	  private Button _tenButton;
-	  public Button tenButton
+	  private List<GameObject> _TenWidgetitems;
+	  public List<GameObject> TenWidgetitems
 	   {
 	   get{
-	      if (_tenButton == null)
+	      if (_TenWidgetitems == null)
 	       {
-	         _tenButton  = GetUIUnit<Button>("tenButton"); 
+	         _TenWidgetitems  = GetUIUnit<List<GameObject>>("TenWidgetitems"); 
 	       }
-	      return _tenButton;
+	      return _TenWidgetitems;
+	     }
+	   }
+	  private GameObject _WidgetItemType2Gam;
+	  public GameObject WidgetItemType2Gam
+	   {
+	   get{
+	      if (_WidgetItemType2Gam == null)
+	       {
+	         _WidgetItemType2Gam  = GetUIUnit<GameObject>("WidgetItemType2Gam"); 
+	       }
+	      return _WidgetItemType2Gam;
+	     }
+	   }
+	  private GameObject _TenRoot;
+	  public GameObject TenRoot
+	   {
+	   get{
+	      if (_TenRoot == null)
+	       {
+	         _TenRoot  = GetUIUnit<GameObject>("TenRoot"); 
+	       }
+	      return _TenRoot;
+	     }
+	   }
+	  private GameObject _OneRoot;
+	  public GameObject OneRoot
+	   {
+	   get{
+	      if (_OneRoot == null)
+	       {
+	         _OneRoot  = GetUIUnit<GameObject>("OneRoot"); 
+	       }
+	      return _OneRoot;
 	     }
 	   }
-	  private Text _tenCion;
-	  public Text tenCion
+	  private Slider _Slider_Count;
+	  public Slider Slider_Count
 	   {
 	   get{
-	      if (_tenCion == null)
+	      if (_Slider_Count == null)
 	       {
-	         _tenCion  = GetUIUnit<Text>("tenCion"); 
+	         _Slider_Count  = GetUIUnit<Slider>("Slider_Count"); 
 	       }
-	      return _tenCion;
+	      return _Slider_Count;
 	     }
 	   }
-	  private RectTransform _GridItem;
-	  public RectTransform GridItem
+	  private Text _Text_Count;
+	  public Text Text_Count
 	   {
 	   get{
-	      if (_GridItem == null)
+	      if (_Text_Count == null)
 	       {
-	         _GridItem  = GetUIUnit<RectTransform>("GridItem"); 
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
 	       }
-	      return _GridItem;
+	      return _Text_Count;
 	     }
 	   }
-	  private List<RectTransform> _PosRoot;
-	  public List<RectTransform> PosRoot
+	  private GameObject _StartRoot;
+	  public GameObject StartRoot
 	   {
 	   get{
-	      if (_PosRoot == null)
+	      if (_StartRoot == null)
 	       {
-	         _PosRoot  = GetUIUnit<List<RectTransform>>("PosRoot"); 
+	         _StartRoot  = GetUIUnit<GameObject>("StartRoot"); 
 	       }
-	      return _PosRoot;
+	      return _StartRoot;
 	     }
 	   }
-	  private RectTransform _fxpos;
-	  public RectTransform fxpos
+	  private Text _Text_JingDu;
+	  public Text Text_JingDu
 	   {
 	   get{
-	      if (_fxpos == null)
+	      if (_Text_JingDu == null)
 	       {
-	         _fxpos  = GetUIUnit<RectTransform>("fxpos"); 
+	         _Text_JingDu  = GetUIUnit<Text>("Text_JingDu"); 
 	       }
-	      return _fxpos;
+	      return _Text_JingDu;
 	     }
 	   }
-	  private UIParticle _fx_ui_box_click;
-	  public UIParticle fx_ui_box_click
+	  private Text _Text_Score;
+	  public Text Text_Score
 	   {
 	   get{
-	      if (_fx_ui_box_click == null)
+	      if (_Text_Score == null)
 	       {
-	         _fx_ui_box_click  = GetUIUnit<UIParticle>("fx_ui_box_click"); 
+	         _Text_Score  = GetUIUnit<Text>("Text_Score"); 
 	       }
-	      return _fx_ui_box_click;
+	      return _Text_Score;
 	     }
 	   }
-	  private Text _text_btnText;
-	  public Text text_btnText
+	  private Text _Text_ScoreCount;
+	  public Text Text_ScoreCount
 	   {
 	   get{
-	      if (_text_btnText == null)
+	      if (_Text_ScoreCount == null)
 	       {
-	         _text_btnText  = GetUIUnit<Text>("text_btnText"); 
+	         _Text_ScoreCount  = GetUIUnit<Text>("Text_ScoreCount"); 
 	       }
-	      return _text_btnText;
+	      return _Text_ScoreCount;
 	     }
 	   }
-	  private RectTransform _Group_ResourceBar;
-	  public RectTransform Group_ResourceBar
+	  private GameObject _ScoreName;
+	  public GameObject ScoreName
 	   {
 	   get{
-	      if (_Group_ResourceBar == null)
+	      if (_ScoreName == null)
 	       {
-	         _Group_ResourceBar  = GetUIUnit<RectTransform>("Group_ResourceBar"); 
+	         _ScoreName  = GetUIUnit<GameObject>("ScoreName"); 
 	       }
-	      return _Group_ResourceBar;
+	      return _ScoreName;
 	     }
 	   }
 	  #endregion 自定义数据结束 

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -0,0 +1,50 @@
+using Core.Language;
+using GameLogic.Bag;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "WidgetItemType2")]
+    public partial class WidgetItemType2 : UIComponent
+    {
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void InitWidget(ItemInfo itemInfo)
+        {
+            // this.isClick = isclick;
+            // this.itemInfo = itemInfo;
+
+            // Icon_quality.icon_name = "dec_wupin_pinzhi" + itemInfo.config.quality;
+
+            icon.gameObject.SetActive(true);
+            icon.icon_name = itemInfo.config.icon;
+            // Icon_WenHao.gameObject.SetActive(false);
+
+            Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
+
+            if (itemInfo.count.Value > 0)
+            {
+                Text_Count.gameObject.SetActive(true);
+                Text_Count.text = itemInfo.count.Value.ToStringEx();
+            }
+            else
+            {
+                Text_Count.gameObject.SetActive(false);
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CCsdt37+U3vGHdnOoYg/uYuvuNiMU41D1hBAQNFAGDuKppRvUZv0paRa1tSt
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2Data.cs

@@ -0,0 +1,95 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class WidgetItemType2 
+	{
+	  #region 自定义数据 
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private MyImage _icon;
+	  public MyImage icon
+	   {
+	   get{
+	      if (_icon == null)
+	       {
+	         _icon  = GetUIUnit<MyImage>("icon"); 
+	       }
+	      return _icon;
+	     }
+	   }
+	  private Text _Text_Count;
+	  public Text Text_Count
+	   {
+	   get{
+	      if (_Text_Count == null)
+	       {
+	         _Text_Count  = GetUIUnit<Text>("Text_Count"); 
+	       }
+	      return _Text_Count;
+	     }
+	   }
+	  private Button _Btn_WidgetItem;
+	  public Button Btn_WidgetItem
+	   {
+	   get{
+	      if (_Btn_WidgetItem == null)
+	       {
+	         _Btn_WidgetItem  = GetUIUnit<Button>("Btn_WidgetItem"); 
+	       }
+	      return _Btn_WidgetItem;
+	     }
+	   }
+	  private MyImage _Icon_quality;
+	  public MyImage Icon_quality
+	   {
+	   get{
+	      if (_Icon_quality == null)
+	       {
+	         _Icon_quality  = GetUIUnit<MyImage>("Icon_quality"); 
+	       }
+	      return _Icon_quality;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private MyImage _Icon_SuiPian;
+	  public MyImage Icon_SuiPian
+	   {
+	   get{
+	      if (_Icon_SuiPian == null)
+	       {
+	         _Icon_SuiPian  = GetUIUnit<MyImage>("Icon_SuiPian"); 
+	       }
+	      return _Icon_SuiPian;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2Data.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C34ZvSj5BS5xhbUu92LKUY3p6Qman3ar608oDDr0si7uIAC8HJ+6JOGLm9EB
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: