Browse Source

修改bug

lzx 1 ngày trước cách đây
mục cha
commit
2e3b360d93

+ 26 - 26
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -1593,13 +1593,13 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_Coin
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, 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: 90086c527c943e1bb67739406e95cd52
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
+  imageH: 45
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1623,7 +1623,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &342747676854343371
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1644,7 +1644,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 139, y: -538}
-  m_SizeDelta: {x: 221.1, y: 87.3}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &751266163501733369
 CanvasRenderer:
@@ -1719,7 +1719,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1728,15 +1728,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: btn_shengji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
-  imageH: 0
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3049,7 +3049,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7592450372735246186
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3070,7 +3070,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -157, y: -538}
-  m_SizeDelta: {x: 221.1, y: 87.3}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6051607394335434258
 CanvasRenderer:
@@ -3145,7 +3145,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3154,15 +3154,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Sky
+  _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
-  imageH: 0
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 3 - 2
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -335,6 +335,7 @@ public class PlayerManager : Singleton<PlayerManager>
             {
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer++;
                 QianKunDaiAward();
+                AccountFileInfo.Instance.SavePlayerData();
             }
         }
 
@@ -472,13 +473,13 @@ public class PlayerManager : Singleton<PlayerManager>
                 }
             }
 
-            AccountFileInfo.Instance.SavePlayerData();
+            // AccountFileInfo.Instance.SavePlayerData();
         }
     }
 
     public void CalculateOfflineRewards()
     {
-        return;
+        // return;
         if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime && AccountFileInfo.Instance.playerData.ExitTime > 0)
         {
             int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);

+ 17 - 11
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -31,12 +31,20 @@ namespace Fort23.Mono
             isAddStack = true;
             IsShowAppBar = false;
         }
+
         public override CTask GetFocus()
         {
             AppBarPanel.ClosePanel();
+            TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
             return base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            TitlePanel.ClosePanel();
+            return base.LoseFocus();
+        }
+
         protected override void AddEvent()
         {
         }
@@ -93,22 +101,22 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(widget);
             }
 
-            _energyWidgets.Clear();
-            EnergyWidget energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
-            _energyWidgets.Add(energyWidget);
-            energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
-            _energyWidgets.Add(energyWidget);
+            // _energyWidgets.Clear();
+            // EnergyWidget energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
+            // _energyWidgets.Add(energyWidget);
+            // energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
+            // _energyWidgets.Add(energyWidget);
 
             if (type == 1)
             {
-                text_btnText.text = LanguageManager.Instance.Text(1046);
+                text_btnText.text = "开启一次";
                 Trxt_Cion.text = "x" + _openBoxConfig.oneConsume;
             }
             else if (type == 2)
             {
-                text_btnText.text = LanguageManager.Instance.Text(1047);
+                text_btnText.text = "开启十次";
                 Trxt_Cion.text = "x" + _openBoxConfig.tenConsume;
             }
 
@@ -179,8 +187,6 @@ namespace Fort23.Mono
                     fx_ui_box_click.gameObject.SetActive(false);
                     widgetItems[index].SetActive(true);
                     // widgetItems[index].PlayerAnim();
-      
-            
                 });
                 await TimerComponent.Instance.WaitAsync(180 + Random.Range(0, 100));