fix：1、添加h5 2、修复bug

2026-06-24 17:59:07 +08:00
parent 7846543d1b
commit d2741d39be
40 changed files with 596 additions and 227 deletions
@@ -26,8 +26,8 @@ namespace ChillConnect
            uiInfo.packageName = "ZM_Petty";
            uiInfo.assetName = "com_petty_award";
            uiInfo.layerType = UILayerType.Popup;
-            uiInfo.isNeedOpenAnim = false;
-            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedOpenAnim = true;
+            uiInfo.isNeedCloseAnim = true;
            uiInfo.isNeedUIMask = true;
        }

@@ -39,6 +39,8 @@ namespace ChillConnect

        protected override void OnClose()
        {
+            SaveData.saveDataFunc();
+            
            GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
            
            closeCallback?.Invoke();
@@ -87,7 +89,7 @@ namespace ChillConnect
        private void InitView()
        {
            _mLastState = SaveData.GetSaveObject().PettyState;
-            Debug.Log($"PettyState============: {SaveData.GetSaveObject().PettyState}");
+            // Debug.Log($"PettyState============: {SaveData.GetSaveObject().PettyState}");
            var num = GameHelper.GetCommonModel().SmallReward;
            ui.com_get_panel.text_reward.text = $"{GameHelper.Get102Str(num)} USD";

@@ -292,12 +294,46 @@ namespace ChillConnect
            if (pettyDataLimit != 0)
            {
                ui.com_detail.text_limit.SetVar("day", pettyDataLimit.ToString()).FlushVars();
-            }else
+            }
+            else
            {
                var day = GameHelper.GetCommonModel().ProcessingTime;
                ui.com_detail.text_limit.SetVar("day", day.ToString()).FlushVars();
                SaveData.GetSaveObject().PettyDataLimit = day;
            }
+            
+            if (!IsPettyDataExpired())
+            {
+                ui.com_detail.btn_redeem.visible = true;
+                ui.com_detail.btn_redeem.SetClick(() =>
+                {
+                    Debug.Log($"click redeem code view----------------------");
+                    UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RedeemCodeUI_Open);
+                    CtrlCloseUI();
+                });
+            }
        }
+
+
+        public bool IsPettyDataExpired()
+        {
+            // 1. 获取保存的过期天数限制
+            var pettyDataLimit = SaveData.GetSaveObject().PettyDataLimit;
+    
+            // 2. 获取当前日期（去掉时分秒，只保留日期部分，避免当天误判）
+            DateTime currentDate = DateTime.Now.Date;
+    
+            // 3. 获取数据保存时的日期
+            DateTime saveDate = DateTime.ParseExact(SaveData.GetSaveObject().PettyDateTime, "yyyy.MM.dd", System.Globalization.CultureInfo.InvariantCulture);
+    
+            // 4. 计算时间差
+            TimeSpan timeSpan = currentDate - saveDate;
+    
+            // 5. 判断是否超出限制天数
+            bool isExpired = timeSpan.TotalDays >= pettyDataLimit;
+    
+            return isExpired;
+        }
+        
    }
 }