积分挑战

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -1664,7 +1664,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 302, y: -25}
+  m_AnchoredPosition: {x: 269, y: -25}
   m_SizeDelta: {x: 54, y: 54}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &2971171615382265200
@@ -2096,7 +2096,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "300\u62BD\u6311\u6218"
+  m_Text: "200\u62BD\u6311\u6218"
 --- !u!1 &7228162602162805773
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -1419,8 +1419,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1524343362406380936}
+  m_Children: []
   m_Father: {fileID: 7883065359111312998}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -1967,7 +1966,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "300\u62BD\u6311\u6218\uFF01"
+  m_Text: "200\u62BD\u6311\u6218\uFF01"
 --- !u!1 &7617855394433935135
 GameObject:
   m_ObjectHideFlags: 0
@@ -2046,105 +2045,3 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!1001 &2136543223866302816
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1240912884187550995}
-    m_Modifications:
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 679.3206
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 71.6739
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 352.6603
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -45.83695
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6521240700457994570, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-      propertyPath: m_Name
-      value: SummonScoreAwardWidget
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
---- !u!224 &1524343362406380936 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 612780405416088808, guid: a25026a6670086a4bafcda1458326e1d, type: 3}
-  m_PrefabInstance: {fileID: 2136543223866302816}
-  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/BoxPanel/SummonScoreAwardWidget.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3104106384049443820
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5052309288351803443}
+  - component: {fileID: 36265705508397560}
+  - component: {fileID: 2571407933570388370}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5052309288351803443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  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: 612780405416088808}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.059906006, y: -0.1147995}
+  m_SizeDelta: {x: -7.2346, y: -7.0046}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &36265705508397560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  m_CullTransparentMesh: 1
+--- !u!114 &2571407933570388370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  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: 0.20392157, g: 0.14509805, b: 0.36078432, 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: 1
+  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_juxing_fang_hujiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  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 &4182076321820206894
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +124,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -0.000030517578, y: 0.000049114}
-  m_SizeDelta: {x: 160, y: 47.271}
+  m_AnchoredPosition: {x: 16, y: 0.000049114}
+  m_SizeDelta: {x: 314.2701, y: 47.271}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4903079184172838809
 CanvasRenderer:
@@ -59,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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
@@ -80,6 +169,141 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u8FBE\u5230 20\u5206"
+--- !u!1 &4416841733717985046
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3523379304572982676}
+  - component: {fileID: 3571524982393725727}
+  - component: {fileID: 7389713636848211350}
+  - component: {fileID: 5996297548919620600}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_LingQu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3523379304572982676
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  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: 2841766045215576449}
+  m_Father: {fileID: 612780405416088808}
+  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: -28.1, y: -3.3}
+  m_SizeDelta: {x: 92.4325, y: 29.2277}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3571524982393725727
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  m_CullTransparentMesh: 1
+--- !u!114 &7389713636848211350
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  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: btn_quxiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  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!114 &5996297548919620600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  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: 7389713636848211350}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5188700826369268152
 GameObject:
   m_ObjectHideFlags: 0
@@ -221,7 +445,6 @@ GameObject:
   m_Component:
   - component: {fileID: 612780405416088808}
   - component: {fileID: 6448080632761198331}
-  - component: {fileID: 4271357269007480561}
   - component: {fileID: 38449813028098259}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -243,8 +466,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 4017822524635749390}
+  - {fileID: 5052309288351803443}
   - {fileID: 7560179697145513368}
   - {fileID: 6136234074020137077}
+  - {fileID: 3523379304572982676}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -260,7 +486,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6521240700457994570}
   m_CullTransparentMesh: 1
---- !u!114 &4271357269007480561
+--- !u!114 &38449813028098259
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -269,11 +495,91 @@ MonoBehaviour:
   m_GameObject: {fileID: 6521240700457994570}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 5915434388064214536}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 6136234074020137077}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 2232359856236333771}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_LingQu
+    gameObject: {fileID: 5996297548919620600}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &7532528011211120148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4017822524635749390}
+  - component: {fileID: 5769018569211516025}
+  - component: {fileID: 2232359856236333771}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4017822524635749390
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  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: 612780405416088808}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5769018569211516025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  m_CullTransparentMesh: 1
+--- !u!114 &2232359856236333771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  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_Color: {r: 0.2607205, g: 1, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -281,7 +587,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -290,40 +596,96 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
   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!114 &38449813028098259
+--- !u!1 &8569280850973587507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2841766045215576449}
+  - component: {fileID: 8948756914829440853}
+  - component: {fileID: 4167165529336752922}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2841766045215576449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8569280850973587507}
+  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: 3523379304572982676}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8948756914829440853
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8569280850973587507}
+  m_CullTransparentMesh: 1
+--- !u!114 &4167165529336752922
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6521240700457994570}
+  m_GameObject: {fileID: 8569280850973587507}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data:
-  - key: Text_Name
-    gameObject: {fileID: 5915434388064214536}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: ItemRoot
-    gameObject: {fileID: 6136234074020137077}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
+  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: 21
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9886\u53D6"

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -444,7 +444,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int baodiCount2;
 
         // 存储最近几次十连抽的结果
-        public List<List<int>> drawHistory = new List<List<int>>();
+        public List<IntList> drawHistory = new List<IntList>();
 
         public int score;
 
@@ -452,6 +452,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         
         public bool isSummonSocre;
     }
+    
+    [System.Serializable]
+    public class IntList
+    {
+        public List<int> list;
+    }
 
     [System.Serializable]
     public class SummonSocreData

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -107,9 +107,13 @@ namespace GameLogic.Player
                             drawHistory.Add(itemInfo.itemID);
                         }
 
-                        summonData.drawHistory.Add(drawHistory);
+                        AccountFileInfo.IntList  intList = new AccountFileInfo.IntList();
+                        intList.list = drawHistory;
+                        summonData.drawHistory.Add(intList);
                         CheckAchievements(summonData);
                     }
+                    
+                   
 
                     summonData.tenFreeCount++;
                     summonData.nextTenFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
@@ -129,8 +133,9 @@ namespace GameLogic.Player
                             {
                                 drawHistory.Add(itemInfo.itemID);
                             }
-
-                            summonData.drawHistory.Add(drawHistory);
+                            AccountFileInfo.IntList  intList = new AccountFileInfo.IntList();
+                            intList.list = drawHistory;
+                            summonData.drawHistory.Add(intList);
 
 
                             CheckAchievements(summonData);
@@ -264,7 +269,7 @@ namespace GameLogic.Player
                 // 检查最近 Para0 次十连是否都满足条件
                 for (int i = summonData.drawHistory.Count - openBoxScoreRule.para0; i < summonData.drawHistory.Count; i++)
                 {
-                    if (!CheckSingleDraw(openBoxScoreRule, summonData.drawHistory[i]))
+                    if (!CheckSingleDraw(openBoxScoreRule, summonData.drawHistory[i].list))
                     {
                         allDrawsSatisfy = false;
                         break;

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

@@ -143,6 +143,12 @@ namespace Fort23.Mono
 
         private async void OnButtonCallBack()
         {
+            if (summonData.isSummonSocre)
+            {
+                TipMessagePanel.OpenTipMessagePanel("已经开启300抽挑战，不能进行单抽了");
+                return;
+            }
+            
             //测试代码
             List<ItemInfo> allIitem = await BoxHelper.OneBox(openBoxConfig.ID);
             if (allIitem != null)

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Core.Audio;
 using Core.Language;
 using Core.Utility;
@@ -25,6 +26,8 @@ namespace Fort23.Mono
 
         List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
 
+        private AccountFileInfo.SummonData SummonData;
+
 
         private void Init()
         {
@@ -55,10 +58,21 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            tenButton.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel<GachaPanel>(); });
+            tenButton.onClick.AddListener(() =>
+            {
+                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)
+                /*if (type == 1)
                 {
                     itemInfos = await BoxHelper.OneBox(_openBoxConfig.ID);
                 }
@@ -86,7 +100,9 @@ namespace Fort23.Mono
                     widgetItems[i].InitWidget(itemInfos[i]);
                 }
 
-                CusstomInit();
+                CusstomInit();*/
+                
+                UIManager.Instance.HideUIUIPanel<GachaPanel>();
             });
         }
 
@@ -96,6 +112,8 @@ namespace Fort23.Mono
             type = (int)uiData[1];
             _openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>((int)uiData[2]);
 
+            SummonData = PlayerManager.Instance.SummonManager.summonDataMap[_openBoxConfig.ID];
+
             foreach (var widget in _energyWidgets)
             {
                 UIManager.Instance.DormancyGComponent(widget);
@@ -109,6 +127,7 @@ namespace Fort23.Mono
             // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
             // _energyWidgets.Add(energyWidget);
 
+            /*
             if (type == 1)
             {
                 text_btnText.text = "开启一次";
@@ -118,7 +137,7 @@ namespace Fort23.Mono
             {
                 text_btnText.text = "开启十次";
                 Trxt_Cion.text = "x" + _openBoxConfig.tenConsume;
-            }
+            }*/
 
             foreach (var itemInfo in itemInfos)
             {
@@ -154,7 +173,7 @@ namespace Fort23.Mono
             _gameObjectPools.Clear();
             for (var i = 0; i < widgetItems.Count; i++)
             {
-                animTween.Play("click", false);
+                //animTween.Play("click", false);
                 fx_ui_box_click.gameObject.SetActive(true);
                 fx_ui_box_click.Play();
                 ImageMoveContainer imageMoveContainer = new ImageMoveContainer();
@@ -220,6 +239,16 @@ namespace Fort23.Mono
             }
 
             _energyWidgets.Clear();
+
+            //完成挑战过后自动打开挑战界面
+            if (_openBoxConfig.ProgressRewardChoukaCount != -1 &&
+                SummonData.drawHistory.Count >= _openBoxConfig.ProgressRewardChoukaCount)
+            {
+
+                OpenBoxScorePanel.OpenPanel();
+
+            }
+
             base.Close();
         }
 

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

@@ -4,7 +4,6 @@ using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
 using Coffee.UIExtensions;
-using Core.UI.UTool.UITween;
 
 namespace Fort23.Mono
 {
@@ -44,17 +43,6 @@ namespace Fort23.Mono
 	      return _tenCion;
 	     }
 	   }
-	  private Text _onCion;
-	  public Text onCion
-	   {
-	   get{
-	      if (_onCion == null)
-	       {
-	         _onCion  = GetUIUnit<Text>("onCion"); 
-	       }
-	      return _onCion;
-	     }
-	   }
 	  private RectTransform _GridItem;
 	  public RectTransform GridItem
 	   {
@@ -99,17 +87,6 @@ namespace Fort23.Mono
 	      return _fx_ui_box_click;
 	     }
 	   }
-	  private UITweenController _animTween;
-	  public UITweenController animTween
-	   {
-	   get{
-	      if (_animTween == null)
-	       {
-	         _animTween  = GetUIUnit<UITweenController>("animTween"); 
-	       }
-	      return _animTween;
-	     }
-	   }
 	  private Text _text_btnText;
 	  public Text text_btnText
 	   {
@@ -121,17 +98,6 @@ namespace Fort23.Mono
 	      return _text_btnText;
 	     }
 	   }
-	  private Text _Trxt_Cion;
-	  public Text Trxt_Cion
-	   {
-	   get{
-	      if (_Trxt_Cion == null)
-	       {
-	         _Trxt_Cion  = GetUIUnit<Text>("Trxt_Cion"); 
-	       }
-	      return _Trxt_Cion;
-	     }
-	   }
 	  private RectTransform _Group_ResourceBar;
 	  public RectTransform Group_ResourceBar
 	   {

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

@@ -12,6 +12,9 @@ namespace Fort23.Mono
         List<SummonScoreRuleWidget> summonScoreRuleWidgets = new List<SummonScoreRuleWidget>();
         List<SummonScoreAwardWidget> summonScoreAwardWidgets = new List<SummonScoreAwardWidget>();
         AccountFileInfo.SummonData summonData;
+        private OpenBoxProgressReward[] openBoxProgressRewards;
+        
+        OpenBoxConfig openBoxConfig;
 
         private void Init()
         {
@@ -33,18 +36,21 @@ namespace Fort23.Mono
             {
                 summonData.isSummonSocre = true;
                 AccountFileInfo.Instance.SavePlayerData();
+                Btn_Ok.gameObject.SetActive(!summonData.isSummonSocre);
+                StartRoot.gameObject.SetActive(summonData.isSummonSocre);
             });
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             summonData = PlayerManager.Instance.SummonManager.summonDataMap[2];
+            openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(summonData.id);
             List<OpenBoxScoreRule> openBoxScoreRules = PlayerManager.Instance.SummonManager.openBoxScoreRuleMap[2];
             Btn_Ok.gameObject.SetActive(!summonData.isSummonSocre);
             StartRoot.gameObject.SetActive(summonData.isSummonSocre);
             if (summonData.isSummonSocre)
             {
-                Text_JingDu.text = $"当前进度：{summonData.drawHistory.Count}/{300}";
+                Text_JingDu.text = $"当前进度：{summonData.drawHistory.Count}/{openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分：{summonData.score}";
             }
 
@@ -55,17 +61,68 @@ namespace Fort23.Mono
                 summonScoreRuleWidgets.Add(summonScoreRuleWidget);
             }
 
-            OpenBoxProgressReward[] openBoxProgressRewards = ConfigComponent.Instance.GetAll<OpenBoxProgressReward>();
+            openBoxProgressRewards = ConfigComponent.Instance.GetAll<OpenBoxProgressReward>();
             foreach (var openBoxProgressReward in openBoxProgressRewards)
             {
                 SummonScoreAwardWidget summonScoreAwardWidget = await UIManager.Instance.CreateGComponent<SummonScoreAwardWidget>(null, Content2);
-                summonScoreAwardWidget.CustomInit(openBoxProgressReward);
+                summonScoreAwardWidget.CustomInit(openBoxProgressReward,AwardSummonScore);
                 summonScoreAwardWidgets.Add(summonScoreAwardWidget);
             }
+            
+            for (var i = summonScoreAwardWidgets.Count - 1; i >= 0; i--)
+            {
+                if (summonData.score >= summonScoreAwardWidgets[i]._openBoxProgressReward.TotalScore)
+                {
+                    summonScoreAwardWidgets[i].Icon_Select.gameObject.SetActive(true);
+
+                    if (summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+                    {
+                        summonScoreAwardWidgets[i].Btn_LingQu.gameObject.SetActive(true);
+                    }
+                    break;
+                }
+            }
 
             return await base.AsyncInit(uiData);
         }
 
+        private void AwardSummonScore()
+        {
+            //到达进度自动领取奖励
+            if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
+                summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+            {
+                
+                
+                for (var i =openBoxProgressRewards.Length-1; i >= 0; i--)
+                {
+                    if (summonData.score >= openBoxProgressRewards[i].TotalScore)
+                    {
+                        for (var i1 = 0; i1 < openBoxProgressRewards[i].PrizeID.Length; i1++)
+                        {
+                            PlayerManager.Instance.BagController.AddItem(openBoxProgressRewards[i].PrizeID[i1],
+                                openBoxProgressRewards[i].PrizeCount[i1]);
+                        }
+                        break;
+                    }
+                }
+                
+                
+                
+                summonData.isSummonSocre = false;
+                summonData.score = 0;
+                summonData.drawHistory.Clear();
+                summonData.summonSocreData.Clear();
+                AccountFileInfo.Instance.SavePlayerData();
+            }
+            else
+            {
+                LogTool.Error("领取失败！");
+            }
+            
+          
+        }
+
 
         public async static CTask OpenPanel()
         {
@@ -88,6 +145,8 @@ namespace Fort23.Mono
 
             summonScoreAwardWidgets.Clear();
 
+            AwardSummonScore();
+
             base.Close();
         }
     }

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Excel2Json;
 using GameLogic.Bag;
@@ -8,7 +9,8 @@ namespace Fort23.Mono
     public partial class SummonScoreAwardWidget : UIComponent
     {
         List<WidgetItem> _widgetItems = new List<WidgetItem>();
-
+        public OpenBoxProgressReward _openBoxProgressReward = new OpenBoxProgressReward();
+        private Action lingquCallBack;
         private void Init()
         {
         }
@@ -23,10 +25,17 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_LingQu.onClick.AddListener(() =>
+            {
+                lingquCallBack?.Invoke();
+                Btn_LingQu.gameObject.SetActive(false);
+            });
         }
 
-        public async void CustomInit(OpenBoxProgressReward openBoxProgressReward)
+        public async void CustomInit(OpenBoxProgressReward openBoxProgressReward,Action lingquCallBack)
         {
+            this.lingquCallBack = lingquCallBack;
+            _openBoxProgressReward = openBoxProgressReward;
             Text_Name.text = $"累计达到 {openBoxProgressReward.TotalScore}";
             for (var i = 0; i < openBoxProgressReward.PrizeID.Length; i++)
             {
@@ -44,7 +53,9 @@ namespace Fort23.Mono
             }
 
             _widgetItems.Clear();
-
+            
+            Icon_Select.gameObject.SetActive(false);
+            Btn_LingQu.gameObject.SetActive(false);
             base.DormancyObj();
         }
     }

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

@@ -30,6 +30,28 @@ namespace Fort23.Mono
 	      return _ItemRoot;
 	     }
 	   }
+	  private MyImage _Icon_Select;
+	  public MyImage Icon_Select
+	   {
+	   get{
+	      if (_Icon_Select == null)
+	       {
+	         _Icon_Select  = GetUIUnit<MyImage>("Icon_Select"); 
+	       }
+	      return _Icon_Select;
+	     }
+	   }
+	  private Button _Btn_LingQu;
+	  public Button Btn_LingQu
+	   {
+	   get{
+	      if (_Btn_LingQu == null)
+	       {
+	         _Btn_LingQu  = GetUIUnit<Button>("Btn_LingQu"); 
+	       }
+	      return _Btn_LingQu;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{