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

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8133080571240593798
 RectTransform:
   m_ObjectHideFlags: 0
@@ -445,10 +445,10 @@ RectTransform:
   - {fileID: 5428019602683763515}
   m_Father: {fileID: 7858018693182147813}
   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: -288.98627}
-  m_SizeDelta: {x: 646.872, y: 616.7927}
+  m_AnchorMin: {x: 0.5, y: 0.13338424}
+  m_AnchorMax: {x: 0.5, y: 0.51084733}
+  m_AnchoredPosition: {x: 0, y: 1.0136719}
+  m_SizeDelta: {x: 646.872, y: 0.7927246}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2564010822953909151
 CanvasRenderer:
@@ -538,8 +538,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.5809, y: -57.711}
-  m_SizeDelta: {x: 625.863, y: 424.8}
+  m_AnchoredPosition: {x: -0.5809021, y: -57.711}
+  m_SizeDelta: {x: 625.863, y: 320.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6748753096610578173
 CanvasRenderer:
@@ -643,10 +643,10 @@ RectTransform:
   - {fileID: 7237139809221645204}
   m_Father: {fileID: 5366739683216167502}
   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: 11.418977, y: 306.4947}
-  m_SizeDelta: {x: 228.0359, y: 55.1832}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 11.418977, y: -0.50531006}
+  m_SizeDelta: {x: 228.0359, y: 55.183197}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5341967818580382441
 CanvasRenderer:
@@ -828,10 +828,10 @@ RectTransform:
   - {fileID: 7883065359111312998}
   m_Father: {fileID: 5366739683216167502}
   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: 5.1745, y: -6.6163}
-  m_SizeDelta: {x: 633.25, y: 565.8463}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5.1744995, y: -6.6163025}
+  m_SizeDelta: {x: -12.75, y: -48.153687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1299575708875599391
 CanvasRenderer:
@@ -934,10 +934,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5366739683216167502}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 643.5944, y: 613.34}
+  m_SizeDelta: {x: -2.4055786, y: -0.65997314}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5592096566782003340
 CanvasRenderer:
@@ -1389,10 +1389,10 @@ RectTransform:
   - {fileID: 7331267903340754230}
   m_Father: {fileID: 7858018693182147813}
   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: 331.11133}
-  m_SizeDelta: {x: 644.9078, y: 566.3665}
+  m_AnchorMin: {x: 0.5, y: 0.5271527}
+  m_AnchorMax: {x: 0.5, y: 0.87500006}
+  m_AnchoredPosition: {x: 0, y: 2.1113281}
+  m_SizeDelta: {x: 644.9078, y: -1.6334839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6858452839668547294
 CanvasRenderer:
@@ -2087,10 +2087,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3787544951613840147}
   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.0913, y: 2.5078}
-  m_SizeDelta: {x: 624.514, y: 545.241}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.091308594, y: 2.5078125}
+  m_SizeDelta: {x: -19.486023, y: -18.758972}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8574758566871946628
 CanvasRenderer:

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -1253,8 +1253,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -32.4, y: 3.6}
-  m_SizeDelta: {x: 349.5654, y: 90.0548}
+  m_AnchoredPosition: {x: 44.569878, y: 3.6}
+  m_SizeDelta: {x: 504.1384, y: 90.0548}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5752223019001905554
 CanvasRenderer:
@@ -2837,8 +2837,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -5.9401, y: 0.00011063}
-  m_SizeDelta: {x: 405.25, y: 107.3}
+  m_AnchoredPosition: {x: 43.5041, y: 0.00011063}
+  m_SizeDelta: {x: 504.1384, y: 107.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7447028169586020602
 CanvasRenderer:

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -222,7 +222,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &498122000546911970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6916979475307095600}
+  - component: {fileID: 3098553881310741778}
+  - component: {fileID: 4314374589381719289}
+  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 &6916979475307095600
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3098553881310741778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  m_CullTransparentMesh: 1
+--- !u!114 &4314374589381719289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1671693449042742178
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +124,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.0009498596, y: -29.9}
-  m_SizeDelta: {x: 68.466, y: 30}
+  m_AnchoredPosition: {x: 0.0000026226, y: -29.9}
+  m_SizeDelta: {x: 80, y: 31.1973}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1237620596013164419
 CanvasRenderer:
@@ -59,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +157,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -80,6 +169,273 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &1916139475447988823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2500376018970374053}
+  - component: {fileID: 9106823823273572709}
+  - component: {fileID: 5779671277336139395}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2500376018970374053
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &9106823823273572709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  m_CullTransparentMesh: 1
+--- !u!114 &5779671277336139395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2471961167470248917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 216267843454775406}
+  - component: {fileID: 7113338127107576254}
+  - component: {fileID: 2940579089653344557}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &216267843454775406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7113338127107576254
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  m_CullTransparentMesh: 1
+--- !u!114 &2940579089653344557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3858005826730162093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2115646262538371135}
+  - component: {fileID: 7640830385333969459}
+  - component: {fileID: 6141892540767857241}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2115646262538371135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7640830385333969459
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  m_CullTransparentMesh: 1
+--- !u!114 &6141892540767857241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3946302300112563901
 GameObject:
   m_ObjectHideFlags: 0
@@ -203,6 +559,7 @@ RectTransform:
   - {fileID: 4458728715945139816}
   - {fileID: 5381176108441561872}
   - {fileID: 3608208511281012576}
+  - {fileID: 3154258649401657841}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -246,6 +603,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: StarRoot
+    gameObject: {fileID: 8983252782158562355}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 498122000546911970}
+    - gameObject: {fileID: 3858005826730162093}
+    - gameObject: {fileID: 2471961167470248917}
+    - gameObject: {fileID: 8604186990887004553}
+    - gameObject: {fileID: 1916139475447988823}
   isAssetBundle: 1
 --- !u!1 &7146904648124061661
 GameObject:
@@ -265,7 +632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5381176108441561872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -426,3 +793,184 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8604186990887004553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7245220674678169516}
+  - component: {fileID: 3417995764051712588}
+  - component: {fileID: 5012569221925056839}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7245220674678169516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3417995764051712588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  m_CullTransparentMesh: 1
+--- !u!114 &5012569221925056839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8983252782158562355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3154258649401657841}
+  - component: {fileID: 4372224768594358457}
+  - component: {fileID: 615741272539858957}
+  - component: {fileID: 1812978112319568024}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3154258649401657841
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 6916979475307095600}
+  - {fileID: 2115646262538371135}
+  - {fileID: 216267843454775406}
+  - {fileID: 7245220674678169516}
+  - {fileID: 2500376018970374053}
+  m_Father: {fileID: 3138042374053727249}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.7, y: -38.7}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4372224768594358457
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_CullTransparentMesh: 1
+--- !u!114 &615741272539858957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1812978112319568024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1042,7 +1042,6 @@ RectTransform:
   - {fileID: 3448986095428033778}
   - {fileID: 6705522348014208234}
   - {fileID: 3904336313667662518}
-  - {fileID: 2266508853877018442}
   - {fileID: 3035646753122329493}
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
@@ -1285,6 +1284,7 @@ GameObject:
   - component: {fileID: 3904336313667662518}
   - component: {fileID: 5325227394525925118}
   - component: {fileID: 2297732390318598695}
+  - component: {fileID: 1663606713194946654}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_PlacesName
@@ -1304,14 +1304,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2266508853877018442}
   m_Father: {fileID: 4534880848114758260}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -203.78177, y: 221.8}
-  m_SizeDelta: {x: -507.6071, y: -798.3508}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39.4, y: 217.5}
+  m_SizeDelta: {x: 0, y: 61.64917}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1353,7 +1354,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77\u6D77"
+--- !u!114 &1663606713194946654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7375659200628869323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7911065620788399886
 GameObject:
   m_ObjectHideFlags: 0
@@ -1683,6 +1698,7 @@ GameObject:
   - component: {fileID: 2266508853877018442}
   - component: {fileID: 3013501019931846197}
   - component: {fileID: 2456649883462433114}
+  - component: {fileID: 2770893818892637768}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_PlacesComplteProgress
@@ -1703,13 +1719,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4534880848114758260}
+  m_Father: {fileID: 3904336313667662518}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -75.2, y: 216.5}
-  m_SizeDelta: {x: -442.781, y: -823.39984}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 166.4, y: 0}
+  m_SizeDelta: {x: 163, y: 36.180115}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3013501019931846197
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1752,6 +1768,26 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63A2\u7D22\u5EA6:0%"
+--- !u!114 &2770893818892637768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661358576281957541}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -4834,7 +4834,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -242,7 +242,9 @@ namespace GameLogic.Bag
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
 
+
             item.count += count;
+      
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
@@ -250,6 +252,17 @@ namespace GameLogic.Bag
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
             RedDotManager.Instance.AllRedDotUpDate();
+            
+            
+            //合成免广告道具
+            if (item.config.associateID == 10)
+            {
+                if (item.count >= item.config.associateVlaue[0])
+                {
+                    AddItem(item.config.associateVlaue[1], 1);
+                }
+            }
+            
             return true;
         }
 

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -98,6 +98,8 @@ namespace GameLogic.Player
                         }
 
 #endif
+
+                        await TimerComponent.Instance.WaitAsync(1000);
                     }
                     else
                     {
@@ -105,7 +107,8 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.oneConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
+                                openBoxConfig.oneConsume);
                         }
                         else
                         {
@@ -173,7 +176,8 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.tenConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
+                                openBoxConfig.tenConsume);
                         }
                         else
                         {
@@ -202,111 +206,142 @@ namespace GameLogic.Player
                     summonData.tenPayCount++;
                 }
             }
-
+            
             AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
 
         public List<ItemInfo> Summon(AccountFileInfo.SummonData summonData, int count)
         {
-            List<ItemInfo> allIitem = new List<ItemInfo>();
+            List<ItemInfo> allItem = new List<ItemInfo>();
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(summonData.id);
 
-            bool isBoadi2 = false;
-            //找到保底池子所有道具
-            List<int> baodiItems = new List<int>();
-            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(openBoxConfig.reward2);
-            for (var i = 0; i < dropConfig.dropGroupID.Length; i++)
-            {
-                DropGroupConfig dropGroupConfig =
-                    ConfigComponent.Instance.Get<DropGroupConfig>(dropConfig.dropGroupID[i]);
-                for (var i1 = 0; i1 < dropGroupConfig.dropItemID.Length; i1++)
-                {
-                    DropItemConfig dropItemConfig =
-                        ConfigComponent.Instance.Get<DropItemConfig>(dropGroupConfig.dropItemID[i1]);
-                    for (var i2 = 0; i2 < dropItemConfig.itemID.Length; i2++)
-                    {
-                        baodiItems.Add(dropItemConfig.itemID[i2]);
-                    }
-                }
-            }
+            // 预计算保底物品集合（性能优化）
+            HashSet<int> baodiItemSet = CalculateBaodiItems(openBoxConfig.reward2);
 
             int index = 0;
 
             for (int i = 0; i < count; i++)
             {
-                isBoadi2 = false;
-
-                //十连保底1 每10次十连必出这个池子
+                // 十连保底1
                 if (summonData.baodiCount1 >= 9)
                 {
-                    List<ItemInfo> addItem = DropManager.Instance.DropItem(openBoxConfig.reward1);
-                    PlayerManager.Instance.BagController.AddItem(addItem);
-
-                    allIitem.AddRange(addItem);
-                    summonData.baodiCount1 = 0;
-                    summonData.baodiCount2++;
-
-                    foreach (var baodiItem in baodiItems)
-                    {
-                        //除了保底2池子里的道具直接重置保底2
-                        if (addItem.FirstOrDefault(i => i.itemID == baodiItem) != null)
-                        {
-                            summonData.baodiCount2 = 0;
-                            break;
-                        }
-                    }
-
+                    var addItem = ProcessBaodi1(summonData, openBoxConfig, baodiItemSet);
+                    allItem.AddRange(addItem);
                     continue;
                 }
 
-                //十连保底2 每reward2para1次十连必出这个池子
+                // 十连保底2
                 if (summonData.baodiCount2 >= openBoxConfig.reward2para1)
                 {
-                    List<ItemInfo> addItem1 = DropManager.Instance.DropItem(openBoxConfig.reward2);
-                    PlayerManager.Instance.BagController.AddItem(addItem1);
-                    summonData.baodiCount2 = 0;
+                    var addItem = ProcessBaodi2(summonData, openBoxConfig);
+                    allItem.AddRange(addItem);
                     continue;
                 }
 
-                List<ItemInfo> addItem2;
-                if (count == 1)
-                {
-                    addItem2 = DropManager.Instance.DropItem(
-                        openBoxConfig.reward[Random.Range(0, openBoxConfig.reward.Length)]);
-                    PlayerManager.Instance.BagController.AddItem(addItem2);
-                    allIitem.AddRange(addItem2);
-                    summonData.baodiCount1++;
-                }
-                else
-                {
-                    addItem2 = DropManager.Instance.DropItem(openBoxConfig.reward[index]);
-                    PlayerManager.Instance.BagController.AddItem(addItem2);
-                    allIitem.AddRange(addItem2);
-                    summonData.baodiCount1++;
-                    index++;
-                }
+                // 正常抽卡
+                var normalItems = ProcessNormalSummon(summonData, openBoxConfig, count, ref index);
+                allItem.AddRange(normalItems);
+
+                // 检查是否触发保底2重置
+                CheckBaodi2Reset(summonData, normalItems, baodiItemSet);
+            }
 
+            PlayerManager.Instance.BagController.AddItem(allItem);
 
-                foreach (var baodiItem in baodiItems)
+
+            AccountFileInfo.Instance.SavePlayerData();
+            return allItem;
+        }
+
+        // 计算保底物品集合
+        private HashSet<int> CalculateBaodiItems(int rewardId)
+        {
+            HashSet<int> baodiSet = new HashSet<int>();
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(rewardId);
+
+            foreach (int groupId in dropConfig.dropGroupID)
+            {
+                DropGroupConfig dropGroupConfig = ConfigComponent.Instance.Get<DropGroupConfig>(groupId);
+                foreach (int itemId in dropGroupConfig.dropItemID)
                 {
-                    //除了保底2池子里的道具直接重置保底2
-                    if (addItem2.FirstOrDefault(i => i.itemID == baodiItem) != null)
+                    DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(itemId);
+                    foreach (int item in dropItemConfig.itemID)
                     {
-                        summonData.baodiCount2 = 0;
-                        isBoadi2 = true;
-                        break;
+                        baodiSet.Add(item);
                     }
                 }
+            }
 
-                if (!isBoadi2)
-                {
-                    summonData.baodiCount2++;
-                }
+            return baodiSet;
+        }
+
+        // 处理十连保底1
+        private List<ItemInfo> ProcessBaodi1(AccountFileInfo.SummonData summonData, OpenBoxConfig config,
+            HashSet<int> baodiSet)
+        {
+            var addItem = DropManager.Instance.DropItem(config.reward1);
+
+            // AccountFileInfo.Instance.SavePlayerData();
+            summonData.baodiCount1 = 0;
+            summonData.baodiCount2++;
+
+            // 检查保底2重置
+            if (addItem.Any(i => baodiSet.Contains(i.itemID)))
+            {
+                summonData.baodiCount2 = 0;
             }
 
+            return addItem;
+        }
+
+        //处理十连保底2
+        private List<ItemInfo> ProcessBaodi2(AccountFileInfo.SummonData summonData, OpenBoxConfig config)
+        {
+            var addItem = DropManager.Instance.DropItem(config.reward2);
+            // PlayerManager.Instance.BagController.AddItem(addItem);
+            summonData.baodiCount2 = 0;
             AccountFileInfo.Instance.SavePlayerData();
-            return allIitem;
+            return addItem;
+        }
+
+        // 处理正常抽卡
+        private List<ItemInfo> ProcessNormalSummon(AccountFileInfo.SummonData summonData, OpenBoxConfig config,
+            int count, ref int index)
+        {
+            List<ItemInfo> addItem;
+
+            if (count == 1)
+            {
+                int randomIndex = Random.Range(0, config.reward.Length);
+                addItem = DropManager.Instance.DropItem(config.reward[randomIndex]);
+            }
+            else
+            {
+                int poolIndex = index % config.reward.Length;
+                addItem = DropManager.Instance.DropItem(config.reward[poolIndex]);
+                index++;
+            }
+
+            // AccountFileInfo.Instance.SavePlayerData();
+            // PlayerManager.Instance.BagController.AddItem(addItem);
+            summonData.baodiCount1++;
+
+            return addItem;
+        }
+
+        //检查保底2重置
+        private void CheckBaodi2Reset(AccountFileInfo.SummonData summonData, List<ItemInfo> items,
+            HashSet<int> baodiSet)
+        {
+            if (items.Any(i => baodiSet.Contains(i.itemID)))
+            {
+                summonData.baodiCount2 = 0;
+            }
+            else
+            {
+                summonData.baodiCount2++;
+            }
         }
 
 

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

@@ -43,6 +43,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             // TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
             return base.GetFocus();
         }
@@ -66,18 +67,22 @@ namespace Fort23.Mono
             tenButton.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                      if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
 #endif
 
                 tenButton.gameObject.SetActive(false);
@@ -193,7 +198,6 @@ namespace Fort23.Mono
 
             await MarskPanel.ClosePanel();
             root.gameObject.SetActive(true);
-
         }
 
 

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Player;
 
 namespace Fort23.Mono
@@ -66,7 +67,7 @@ namespace Fort23.Mono
                     $"当前进度：{summonData.drawHistory.Count * 10}/{openBoxConfig.ProgressRewardChoukaCount}";
                 Text_Score.text = $"目前得分：{summonData.score}";
             }
-            
+
             using (CTaskAwaitBuffer cts =
                    new CTaskAwaitBuffer())
             {
@@ -137,6 +138,7 @@ namespace Fort23.Mono
 
         private void AwardSummonScore()
         {
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
             //到达进度自动领取奖励
             if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
                 summonData.drawHistory.Count * 10 >= openBoxConfig.ProgressRewardChoukaCount)
@@ -147,8 +149,8 @@ namespace Fort23.Mono
                     {
                         for (var i1 = 0; i1 < openBoxProgressRewards[i].PrizeID.Length; i1++)
                         {
-                            PlayerManager.Instance.BagController.AddItem(openBoxProgressRewards[i].PrizeID[i1],
-                                openBoxProgressRewards[i].PrizeCount[i1]);
+                            itemInfos.Add(new ItemInfo(openBoxProgressRewards[i].PrizeID[i1],
+                                openBoxProgressRewards[i].PrizeCount[i1]));
                         }
 
                         break;
@@ -163,8 +165,10 @@ namespace Fort23.Mono
                 {
                     summonSocreData.currentCount = 0;
                 }
-                // summonData.summonSocreData.Clear();
+
+                PlayerManager.Instance.BagController.AddItem(itemInfos);
                 AccountFileInfo.Instance.SavePlayerData();
+                RewardsPanel.OpenPanel(itemInfos);
             }
             else
             {

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2.cs

@@ -41,6 +41,8 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(false);
         }
 
         public void CustomInit(SkillInfo skillInfo, bool isUlock = true)
@@ -58,6 +60,19 @@ namespace Fort23.Mono
             {
                 this.transform.Gray();
             }
+
+            StarRoot[0].transform.parent.gameObject.SetActive(true);
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                if (i < skillInfo.skillConfig.level - 1)
+                {
+                    StarRoot[i].gameObject.SetActive(true);
+                }
+                else
+                {
+                    StarRoot[i].gameObject.SetActive(false);
+                }
+            }
         }
 
         public override void DormancyObj()

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2Data.cs

@@ -41,6 +41,17 @@ namespace Fort23.Mono
 	      return _Icon_FabaoIcon;
 	     }
 	   }
+	  private List<GameObject> _StarRoot;
+	  public List<GameObject> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<GameObject>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -64,7 +64,7 @@ namespace Fort23.Mono
             ItemAssociateConfig itemAssociateConfig =
                 ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
 
-            if (itemAssociateConfig.LanID != -1)
+            if (itemAssociateConfig.LanID != -1 || itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -59,18 +59,23 @@ namespace Fort23.Mono
             Btn_ShuangBei.onClick.AddListener(async () =>
             {
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                if (TakuSDKManager.Instance.IsReady())
+                if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
-                    bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
-                    if (!isOK)
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
+                        if (!isOK)
+                        {
+                            return;
+                        }
+                    }
+                    else
                     {
                         return;
                     }
                 }
-                else
-                {
-                    return;
-                }
+
+        
 
 #endif
                 float beLv =