抽卡添加总次数

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -177,7 +177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -271,7 +271,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 60.7, y: -75.935}
+  m_AnchoredPosition: {x: -1, y: -75.935}
   m_SizeDelta: {x: 141.0059, y: 38.1744}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &593285393034570064
@@ -315,7 +315,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5B8C\u6210\u6B21\u6570"
+  m_Text: "\u6B21\u6570"
 --- !u!114 &3186297236251683901
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -779,7 +779,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u79EF\u5206\u5956\u52B1"
+  m_Text: "\u5956\u52B1"
 --- !u!114 &3822665200114326682
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1383,6 +1383,7 @@ RectTransform:
   - {fileID: 3758813775204660129}
   - {fileID: 3834812936624691349}
   - {fileID: 3050252600027618270}
+  - {fileID: 2427572067098883633}
   - {fileID: 8025284597209496932}
   - {fileID: 1103027575177061578}
   - {fileID: 7331267903340754230}
@@ -1480,7 +1481,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 224.4, y: -75.935}
+  m_AnchoredPosition: {x: 118, y: -75.935}
   m_SizeDelta: {x: 141.0059, y: 38.1744}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6195597745949149028
@@ -1524,7 +1525,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u79EF\u5206\u6C47\u603B"
+  m_Text: "\u6C47\u603B"
 --- !u!114 &5220332990210850460
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2142,6 +2143,100 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6743656073386139646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2427572067098883633}
+  - component: {fileID: 708402199648556839}
+  - component: {fileID: 4469079684305617604}
+  - component: {fileID: 4614214440421101023}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2427572067098883633
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6743656073386139646}
+  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: 3787544951613840147}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 247, y: -75.935}
+  m_SizeDelta: {x: 141.0059, y: 38.1744}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &708402199648556839
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6743656073386139646}
+  m_CullTransparentMesh: 1
+--- !u!114 &4469079684305617604
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6743656073386139646}
+  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.6745098, g: 0.48235294, b: 0.39607844, 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: 59
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u603B\u6B21\u6570"
+--- !u!114 &4614214440421101023
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6743656073386139646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10370
 --- !u!1 &6979838843896054052
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/SummonScoreRuleWidget.prefab

@@ -195,7 +195,7 @@ 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: 300.1, y: -0.8001218}
+  m_AnchoredPosition: {x: 228, y: -0.8001218}
   m_SizeDelta: {x: 160, y: 47.271}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2775722744707172600
@@ -240,6 +240,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 14
+--- !u!1 &6890452907601043903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4443707797005453326}
+  - component: {fileID: 3992916218892811438}
+  - component: {fileID: 2957373006384360067}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_AllCount
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4443707797005453326
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6890452907601043903}
+  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: 2513701189896696577}
+  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: 476, y: -0.8}
+  m_SizeDelta: {x: 160, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3992916218892811438
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6890452907601043903}
+  m_CullTransparentMesh: 1
+--- !u!114 &2957373006384360067
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6890452907601043903}
+  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.52156866, g: 0.24705882, b: 0.12941177, 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: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 14
 --- !u!1 &8053076530969729128
 GameObject:
   m_ObjectHideFlags: 0
@@ -277,6 +357,7 @@ RectTransform:
   - {fileID: 5585334762211831468}
   - {fileID: 1880613761067236836}
   - {fileID: 1931183890266412572}
+  - {fileID: 4443707797005453326}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -373,6 +454,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_AllCount
+    gameObject: {fileID: 2957373006384360067}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &1991571992928035428
 MonoBehaviour:
@@ -440,7 +526,7 @@ 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: 462.5, y: -0.8}
+  m_AnchoredPosition: {x: 347, y: -0.8}
   m_SizeDelta: {x: 160, y: 47.271}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3108098518332107761

Assets/Res/UI/TowerPanel/TowerLevelWidget.prefab

@@ -76,14 +76,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_1_2_1
+  _icon_name: icon_Gem_Star_Blue
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
   imageH: 95.91097
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/TowerPanel/TowerPanel.prefab

@@ -1395,10 +1395,10 @@ RectTransform:
   - {fileID: 5294598652921069011}
   m_Father: {fileID: 2697149107937856371}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 377}
+  m_SizeDelta: {x: 0, y: 377}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8915179649739136959
 CanvasRenderer:

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

@@ -43,7 +43,7 @@ namespace Fort23.Mono
             for (var i = 0; i < openBoxProgressReward.PrizeID.Length; i++)
             {
                 WidgetItem widgetItem =
-                    await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGam, null, ItemRoot);
+                    await UIManager.Instance.CreateGComponentForObject<WidgetItem>(WidgetItemGam, null, ItemRoot,isInstance:true);
                 widgetItem.InitWidget(new ItemInfo(openBoxProgressReward.PrizeID[i],
                     openBoxProgressReward.PrizeCount[i]));
                 _widgetItems.Add(widgetItem);

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

@@ -25,7 +25,7 @@ namespace Fort23.Mono
         {
         }
 
-        public void CustomInit(OpenBoxScoreRule scoreRule,int idnex)
+        public void CustomInit(OpenBoxScoreRule scoreRule, int idnex)
         {
             if (idnex % 2 == 0)
             {
@@ -33,14 +33,17 @@ namespace Fort23.Mono
             }
             else
             {
-                ctc.ChangeState(1);  
+                ctc.ChangeState(1);
             }
-            AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[scoreRule.openBoxID];
+
+            AccountFileInfo.SummonData summonData =
+                PlayerManager.Instance.SummonManager.summonDataMap[scoreRule.openBoxID];
             socreData = summonData.summonSocreData.FirstOrDefault(ss => ss.id == scoreRule.ID);
             Text_Name.text = LanguageManager.Instance.Text(scoreRule.lanID);
             Text_Score.text = scoreRule.score.ToString();
             Text_CompleteCount.text = socreData == null ? "0" : socreData.currentCount.ToString();
             Text_AllScore.text = socreData == null ? "0" : (socreData.currentCount * scoreRule.score).ToString();
+            Text_AllCount.text = socreData == null ? "0" : socreData.count.ToString();
         }
     }
 }

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

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

Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -38,6 +38,7 @@ namespace Fort23.Mono
                 {
                     return;
                 }
+
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
                 ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[0], 1);
                 itemInfos.Add(itemInfo);
@@ -60,7 +61,7 @@ namespace Fort23.Mono
 
             lastTowerLevelData = towerData.towerLevelDatas.FirstOrDefault(t => t.id == _towerInfoConfig.ID - 1);
 
-            Text_Name.text = LanguageManager.Instance.Text(_towerInfoConfig.name);
+            Text_Name.text = LanguageManager.Instance.Text(10365, _towerInfoConfig.ID);
 
 
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_towerInfoConfig.reward[0]);