Merge remote-tracking branch 'remotes/origin/master' into GFG

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -35,6 +35,7 @@ namespace GFGGame
             //LoginAddress = "192.168.1.7:10005";//测试地址
 #if !GFGZSB
             LoginAddress = "192.168.1.191:10005";//测试地址
+            //LoginAddress = "43.139.184.240:10003";
 #endif
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -198,22 +198,9 @@ namespace GFGGame
                 UI_ComProBonus.ProxyEnd();
             }
 
-            // 简化时间比较逻辑，直接使用当前时间
-            if (_year > dateTime.Year || (_year == dateTime.Year && _month > dateTime.Month))
-            {
-                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
-            }
-            else if (_year == dateTime.Year && _month == dateTime.Month)
-            {
-                _ui.m_list.numItems = signBonusCfgs.Count > 29
-                    ? signBonusCfgs.Count + 1 - dateTime.Day
-                    : signBonusCfgs.Count - dateTime.Day + 1;
-            }
-            else
-            {
-                // 如果当前时间早于dateTime，显示0个项
-                _ui.m_list.numItems = 0;
-            }
+            // 修复：直接显示当前月份的所有签到项
+            // 如果当前月份有超过29天的配置，显示所有配置项
+            _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
         }
 
         private async void OnBtnGetProBonus(EventContext context)
@@ -239,10 +226,8 @@ namespace GFGGame
         {
             UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
 
-            if (_month == dateTime.Month)
-            {
-                index += dateTime.Day - 1;
-            }
+            // 修复：移除错误的时间偏移计算
+            // 直接使用原始索引，不再根据dateTime.Day进行偏移
 
             if (index == 29 && _ui.m_list.numItems > 29)
             {
@@ -266,7 +251,7 @@ namespace GFGGame
 
                 item.m_holderSign.visible = false;
                 item.m_c1.selectedIndex = itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
-                item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day); //  bonusCfg.day.ToString();
+                item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day);
                 if (item.m_comItem.data == null)
                 {
                     item.m_comItem.data = new ItemView(item.m_comItem);
@@ -322,10 +307,6 @@ namespace GFGGame
             {
                 result = await DailyWelfareSProxy.ReqSign(day);
             }
-            // if (result)
-            // {
-            //     _ui.m_list.numItems = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month).Count;
-            // }
         }
     }
 }