fix:1、bug修复。

Signed-off-by: barry <barry@gmail.com>

Assets/RedHotRoast/FGUI/package/ZM_Common_01/btn_claim4.cs

@@ -8,6 +8,7 @@ namespace FGUI.ZM_Common_01
     public partial class btn_claim4 : GButton
     {
         public Controller state;
+        public Controller is_gift;
         public const string URL = "ui://o9974uc5s73p5n";
 
         public static btn_claim4 CreateInstance()
@@ -20,6 +21,7 @@ namespace FGUI.ZM_Common_01
             base.ConstructFromXML(xml);
 
             state = GetControllerAt(0);
+            is_gift = GetControllerAt(1);
         }
     }
 }

Assets/RedHotRoast/FGUI/package/ZM_Common_01/com_broadcast1.cs

@@ -7,6 +7,7 @@ namespace FGUI.ZM_Common_01
 {
     public partial class com_broadcast1 : GComponent
     {
+        public GButton btn_record;
         public com_broadcast_text1 broad_cast_text;
         public GGroup broad;
         public GGroup group_;
@@ -23,9 +24,10 @@ namespace FGUI.ZM_Common_01
         {
             base.ConstructFromXML(xml);
 
-            broad_cast_text = (com_broadcast_text1)GetChildAt(0);
+            btn_record = (GButton)GetChildAt(0);
-            broad = (GGroup)GetChildAt(1);
+            broad_cast_text = (com_broadcast_text1)GetChildAt(1);
-            group_ = (GGroup)GetChildAt(2);
+            broad = (GGroup)GetChildAt(2);
+            group_ = (GGroup)GetChildAt(3);
             t0 = GetTransitionAt(0);
             t1 = GetTransitionAt(1);
         }

Assets/RedHotRoast/FGUI/package/ZM_Common_01/com_broadcast_text1.cs

@@ -11,7 +11,6 @@ namespace FGUI.ZM_Common_01
         public GRichTextField cast_text;
         public GRichTextField hide_text;
         public GButton btn_broad;
-        public GLoader broad_icon_loader;
         public const string URL = "ui://o9974uc5mhxp5q";
 
         public static com_broadcast_text1 CreateInstance()
@@ -27,7 +26,6 @@ namespace FGUI.ZM_Common_01
             cast_text = (GRichTextField)GetChildAt(1);
             hide_text = (GRichTextField)GetChildAt(2);
             btn_broad = (GButton)GetChildAt(3);
-            broad_icon_loader = (GLoader)GetChildAt(4);
         }
     }
 }

Assets/RedHotRoast/FGUI/package/ZM_Reward_10/com_reward.cs

@@ -9,6 +9,7 @@ namespace FGUI.ZM_Reward_10
     {
         public Controller cont_collect;
         public Controller cont_white;
+        public Controller is_gift;
         public GButton btn_null;
         public GGraph fx_place;
         public GTextField text_num;
@@ -30,13 +31,14 @@ namespace FGUI.ZM_Reward_10
 
             cont_collect = GetControllerAt(0);
             cont_white = GetControllerAt(1);
+            is_gift = GetControllerAt(2);
             btn_null = (GButton)GetChildAt(0);
-            fx_place = (GGraph)GetChildAt(3);
+            fx_place = (GGraph)GetChildAt(4);
-            text_num = (GTextField)GetChildAt(4);
+            text_num = (GTextField)GetChildAt(5);
-            title1 = (GTextField)GetChildAt(5);
+            title1 = (GTextField)GetChildAt(6);
-            wheel = (GComponent)GetChildAt(6);
+            wheel = (GComponent)GetChildAt(7);
-            btn_multi = (GButton)GetChildAt(7);
+            btn_multi = (GButton)GetChildAt(8);
-            btn_collect = (GButton)GetChildAt(8);
+            btn_collect = (GButton)GetChildAt(9);
             t0 = GetTransitionAt(0);
         }
     }

Assets/RedHotRoast/FGUI/package/ZM_Sign_06/btn_sign.cs

@@ -9,6 +9,7 @@ namespace FGUI.ZM_Sign_06
     {
         public Controller day;
         public Controller state;
+        public Controller is_gift;
         public GTextField reward_num;
         public Transition t0;
         public const string URL = "ui://8ihaqs6isebxc";
@@ -24,7 +25,8 @@ namespace FGUI.ZM_Sign_06
 
             day = GetControllerAt(0);
             state = GetControllerAt(1);
-            reward_num = (GTextField)GetChildAt(5);
+            is_gift = GetControllerAt(2);
+            reward_num = (GTextField)GetChildAt(6);
             t0 = GetTransitionAt(0);
         }
     }

Assets/RedHotRoast/FGUI/package/bkg_jilu/com_record_item.cs

@@ -8,9 +8,9 @@ namespace FGUI.bkg_jilu
     public partial class com_record_item : GComponent
     {
         public GTextField name;
-        public GTextField num;
+        public GTextField lab_claim;
+        public GRichTextField num;
         public GTextField time;
-        public GLoader icon_loader;
         public const string URL = "ui://u5bqcwhxf6p04";
 
         public static com_record_item CreateInstance()
@@ -23,9 +23,9 @@ namespace FGUI.bkg_jilu
             base.ConstructFromXML(xml);
 
             name = (GTextField)GetChildAt(1);
-            num = (GTextField)GetChildAt(3);
+            lab_claim = (GTextField)GetChildAt(2);
+            num = (GRichTextField)GetChildAt(3);
             time = (GTextField)GetChildAt(4);
-            icon_loader = (GLoader)GetChildAt(5);
         }
     }
 }

Assets/RedHotRoast/Helper/GameHelper.cs

@@ -496,7 +496,7 @@ namespace RedHotRoast
             string countryCode = "US";
             try
             {
-                countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;
+                countryCode = Language.getCurrentLanguage();
                 // Debug.Log("国家代码: " + countryCode); // 例如：US, CN, JP, DE 等
             }
             catch (System.Exception e)
@@ -935,7 +935,7 @@ namespace RedHotRoast
         public static void addInterAdnumber()
         {
             
-            if(!IsGiftSwitch()) return;
+            return;
 
             if (GetVipPrivilege(Subscription.RemoveInterstitialAd.As<int>())) return;
             look_interad_numbers++;
@@ -1220,13 +1220,21 @@ namespace RedHotRoast
         public static void IsShowFirstReward()
         {
             var isGet = DataMgr.GetFirstReaward.Value;
-            if (!isGet && IsGiftSwitch())
+            if (!isGet)
             {
-                UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open);
+                if (IsGiftSwitch())
+                {
+                    DataMgr.GetFirstReaward.Value = true;
+                    var awardNum = ConfigSystem.GetCommonConf().InitialNum;
+                    addMoney(awardNum);
+                    GameDispatcher.Instance.Dispatch(GameMsg.Update102);
 
                     //小额发放
                     IsShowPettyReward();
                 }
+
+                AddGoldNumber(50);
+            }
         }
 
         private static int ShowStatementViewCount = 0;

Assets/Resources/RedHotRoastAssets/Atlas/Item/102.png.meta

@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 692afc82675973a489c332ca812dfc51
+guid: e8918e64ea332c6489a47038fa091527
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,11 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -38,7 +39,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -63,6 +64,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
@@ -75,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -87,10 +90,11 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -99,6 +103,20 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -111,6 +129,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -127,9 +146,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: atlas.item.assetbundle
+  assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs

@@ -311,7 +311,8 @@ namespace RedHotRoast
             {
                 curr_type = 102;
                 end_ = GameHelper.GetUICenterPosition(ui.top_money, true);
-                awardNum *= GameHelper.GetExchangeRateVo().Multi;
+                awardNum = (float)Math.Round(awardNum * GameHelper.GetExchangeRateVo().Multi, 2);
+                
             }
             var rewardSingleData = new RewardSingleData(curr_type, (decimal)awardNum, RewardOrigin.Play)
             {

Assets/Scripts/ModuleUI/Broadcast/BroadcastUI.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using DG.Tweening;
+using FairyGUI;
 using FGUI.ZM_Common_01;
 using Spine.Unity;
 using UnityEngine;
@@ -47,6 +48,8 @@ namespace RedHotRoast
 
         protected override void OnOpenBefore(object args)
         {
+
+            ui.x = (GRoot.inst.width - 1080) / 2;
             InitView();
             //ui.y = 241;
 
@@ -67,17 +70,13 @@ namespace RedHotRoast
             // }
             text_ui = ui.broad_cast_text;
 
+            ui.btn_record.SetClick(OpenRecord);
+            ui.broad_cast_text.btn_broad.SetClick(OpenRecord);
 
-            text_ui.btn_broad.SetClick(OpenRecord);
+            if (ConfigSystem.GetConfig<exBrPool>() == null) return;
+            config_name_list = exBrPoolModel.config_name_list;
+            config_money_list = exBrPoolModel.config_money_list;
 
-            if (ConfigSystem.GetConfig<SubscribePodcast>() == null) return;
-            config_name_list = SubscribePodcastModel.config_name_list;
-            config_vip_level_list = SubscribePodcastModel.config_vip_level_list;
-
-            GameDispatcher.Instance.AddListener(GameMsg.hideBroadCast, hideEvent);
-            GameDispatcher.Instance.AddListener(GameMsg.showBroadCast, showEvent);
-            UICtrlDispatcher.Instance.AddListener(UICtrlMsg.MainUI_Open, Setbuttom);
-            UICtrlDispatcher.Instance.AddListener(UICtrlMsg.RainPlayUI_Open, Settop);
         }
 
         protected override void OnOpen(object args)
@@ -96,17 +95,23 @@ namespace RedHotRoast
         #region 消息
         protected override void AddListener()
         {
-
+            GameDispatcher.Instance.AddListener(GameMsg.hideBroadCast, hideEvent);
+            GameDispatcher.Instance.AddListener(GameMsg.showBroadCast, showEvent);
+            UICtrlDispatcher.Instance.AddListener(UICtrlMsg.MainUI_Open, Setbuttom);
+            UICtrlDispatcher.Instance.AddListener(UICtrlMsg.RainPlayUI_Open, Settop);
         }
         protected override void RemoveListener()
         {
-
+            GameDispatcher.Instance.RemoveListener(GameMsg.hideBroadCast, hideEvent);
+            GameDispatcher.Instance.RemoveListener(GameMsg.showBroadCast, showEvent);
+            UICtrlDispatcher.Instance.RemoveListener(UICtrlMsg.MainUI_Open, Setbuttom);
+            UICtrlDispatcher.Instance.RemoveListener(UICtrlMsg.RainPlayUI_Open, Settop);
         }
         #endregion
         private int time_count = 11;
         private com_broadcast_text1 text_ui;
         private List<string> config_name_list;
-        private List<string> config_vip_level_list;
+        private List<string> config_money_list;
         private bool main_ui_show = true;
         //初始化页面逻辑
 
@@ -118,7 +123,7 @@ namespace RedHotRoast
 
             var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, ref closeCallback);
             sk.state.SetAnimation(0, "animation", true);
-            ui.broad_cast_text.bg_panel.SetScale(1.45f, 1.1f);
+            ui.broad_cast_text.bg_panel.scaleX = 1.1f;
         }
 
         private void OpenRecord()
@@ -153,37 +158,47 @@ namespace RedHotRoast
                 ui.group_.y += 68;
             }
         }
-# if GAME_RELEASE
-        private const int MaxTime = 300;
-#else
-        private const int MaxTime = 10;
-#endif
         void timeEvent()
         {
             time_count++;
-            // Debug.Log(time_count);
+            // if (time_count > 30)
-            // Debug.Log(MaxTime);
+            // {
-            if (time_count > MaxTime)
+            //     time_count = 0;
+            //     var name_index = UnityEngine.Random.Range(0, config_name_list.Count);
+            //     var money_index = UnityEngine.Random.Range(0, config_money_list.Count);
+            //     if (main_ui_show)
+            //     {
+            //         ui.visible = true;
+            //     }
+            //     Debug.Log(text_ui.cast_text.text);
+            //     text_ui.cast_text.text = String.Format(text_ui.hide_text.text, config_name_list[name_index],
+            //         config_money_list[money_index], DateTimeManager.Instance.GetCurrDateTime());
+            //     text_ui.cast_text.x = 686;
+            //     Tweener tweener = DOTween.To(() => text_ui.cast_text.x,
+            //            x => text_ui.cast_text.x = x, -1300, 10);
+
+            // }
+
+            // time_count = 0;
+
+
+            //Debug.Log($"barry  broad time count======== {time_count}");
+            if (time_count > 20)
             {
                 time_count = 0;
                 var name_index = Random.Range(0, config_name_list.Count);
-                var money_index = Random.Range(0, config_vip_level_list.Count);
+                var money_index = Random.Range(0, config_money_list.Count);
                 Debug.Log(text_ui.cast_text.text);
 
                 string name = config_name_list[name_index];
-                if (name.Length > 8)
+                if (name.Length > 4)
                 {
-                    name = name[..8] + "..";
+                    name = name[..4] + "...";
                 }
-                string broad_text = String.Format(text_ui.hide_text.text, name,
+                // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4");
-                    config_vip_level_list[money_index], DateTimeManager.Instance.GetCurrDateTime());
+                var money_text = GameHelper.Get102Str(decimal.Parse(config_money_list[money_index]));
+                string broad_text = String.Format(GameHelper.getDesByKey("makeup_4"), name, money_text, DateTimeManager.Instance.GetCurrDateTime());
                 text_ui.cast_text.text = broad_text;
-
-                var lv = GetVipLevelFromName(config_vip_level_list[money_index]);
-                text_ui.broad_icon_loader.url = $"ui://LG_Common/vip_{lv}";
-
-                // Tweener tweener = DOTween.To(() => ui.broad.x,
-                //    x => ui.broad.x = x, 200, 0.5f);
                 ui.t0.Play();
 
                 DOVirtual.DelayedCall(3.5f, () =>
@@ -192,30 +207,11 @@ namespace RedHotRoast
                     //     x => ui.broad.x = x, 1080, 0.5f);
                     ui.t1.Play();
                 });
-                string str = name + "#" + config_vip_level_list[money_index] + "#" + DateTimeManager.Instance.GetCurrDateTime();
+                string str = name + "-" + config_money_list[money_index] + "-" + DateTimeManager.Instance.GetCurrDateTime();
                 GameDispatcher.Instance.Dispatch(GameMsg.updateRecordList, str);
 
             }
 
         }
-
-        private int GetVipLevelFromName(string name)
-        {
-            var vip_level = 1;
-            switch (name)
-            {
-                case "Gold":
-                    vip_level = 1;
-                    break;
-                case "Platinum":
-                    vip_level = 2;
-                    break;
-                case "Diamond":
-                    vip_level = 3;
-                    break;
-            }
-
-            return vip_level;
-        }
     }
 }

Assets/Scripts/ModuleUI/RecordView/RecordViewUI.cs

@@ -17,7 +17,7 @@ namespace RedHotRoast
     {
         private RecordViewUICtrl ctrl;
         private RecordViewModel model;
-        private FGUI.bkg_jilu.com_jilu ui;
+        private com_jilu ui;
 
         public RecordViewUI(RecordViewUICtrl ctrl) : base(ctrl)
         {
@@ -43,8 +43,6 @@ namespace RedHotRoast
 
         protected override void OnClose()
         {
-            WebviewManager.Instance.SetDarkThough(true);
-            
             if (coroutine != null)
             {
                 CrazyAsyKit.StopCoroutine(coroutine);
@@ -53,14 +51,11 @@ namespace RedHotRoast
 
         protected override void OnBind()
         {
-            ui = baseUI as FGUI.bkg_jilu.com_jilu;
+            ui = baseUI as com_jilu;
         }
 
         protected override void OnOpenBefore(object args)
         {
-            
-            WebviewManager.Instance.SetDarkThough(false);
-            
             InitView();
 
             ui.btn_close.onClick.Add(() =>
@@ -93,7 +88,7 @@ namespace RedHotRoast
         }
         #endregion
 
-        private bool isroll = false;
+        private bool isroll;
 
         private List<GObject> list_panel = new List<GObject>();
 
@@ -109,7 +104,7 @@ namespace RedHotRoast
             UpdateRecord();
         }
 
-        private Coroutine coroutine = null;
+        private Coroutine coroutine;
         public void UpdateRecord()
         {
             if (ctrl.model == null || ctrl.model.recordList.Count == 0) return;
@@ -130,34 +125,16 @@ namespace RedHotRoast
             }
         }
 
-        private (string key, int value) GetVipLevelFromName(string name)
-        {
-            switch (name)
-            {
-                case "Gold":
-                    return ("G.VIP", 1);
-                case "Platinum":
-                    return ("P.VIP", 2);
-                case "Diamond":
-                    return ("D.VIP", 3);
-                default:
-                    return (string.Empty, 0);
-            }
-        }
-
-
         private void setRecord(int index, GObject obj)
         {
             com_record_item item = (com_record_item)obj;
-            string[] values = ctrl.model.recordList[index].Split('#');
+            string[] values = ctrl.model.recordList[index].Split('-');
 
             item.name.text = values[0];
-            var (key, value) = GetVipLevelFromName(values[1]);
+            item.num.text = GameHelper.getChString(decimal.Parse(values[1]));
-            item.num.text = key; // 假设 money 是显示金额的字段
             string[] parts = values[2].Split(" ");
             item.time.text = parts[0];
-            
+            item.lab_claim.text = GameHelper.getDesByKey("ww");
-            item.icon_loader.url = $"ui://LG_Common/vip_{value}";
         }
 
         private IEnumerator ScrollRoutine()
@@ -169,8 +146,8 @@ namespace RedHotRoast
                 {
                     if (i < list_panel.Count) // 再次检查索引是否有效
                     {
-                        float targetY = list_panel[i].y - 129;
+                        float targetY = list_panel[i].y - 110;
-                        GObjectMoveFunc.MoveTween(list_panel[i], targetY);
+                        list_panel[i].MoveTween(targetY);
                     }
                 }
 

Assets/Scripts/ModuleUI/Reward/RewardUI.cs

@@ -106,6 +106,7 @@ namespace RedHotRoast
             var value = GetRewardValue();
             ui.text_num.text = GameHelper.Get101Str(value);
 
+            ((btn_claim4)ui.btn_collect).is_gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
             DOVirtual.DelayedCall(0.2f, () =>
             {
                 var gamwin =
@@ -113,9 +114,21 @@ namespace RedHotRoast
                 gamwin.state.SetAnimation(0, "out", true);
             });
             
+            ui.is_gift.selectedIndex = GameHelper.IsGiftSwitch()? 1 : 0;
+
             ui.btn_multi.SetClick(OnClickDouble);
             ui.btn_collect.SetClick(OnClickClaim);
+            if (GameHelper.IsGiftSwitch())
+            {
+                ui.text_num.text = GameHelper.Get101Str(value);
+                
+                ui.btn_collect.title = "" + GameHelper.Get101Str((decimal)value);
+            }
+            else
+            {
+                ui.text_num.text = GameHelper.Get101Str(value);
                 ui.btn_collect.title = GameHelper.Get101Str(value);
+            }            
             SetName();
             SetAvatar();
             Set101();
@@ -157,15 +170,25 @@ namespace RedHotRoast
                     break;
                 }
             }
+            if (GameHelper.IsGiftSwitch())
+            {
+                cash_num = value / (decimal)GameHelper.GetExchangeRateVo().Multi;
+            }
+            else
+            {
                 cash_num = value;
+            }
             
+            var src = "(" ;
             (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
             (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
             {
                 rate_idnex++;
-                ui.btn_multi.title = "" + cash_num * boost_array[rate_idnex % 5];
+                var rewards = GameHelper.getChString(cash_num * boost_array[rate_idnex % 5]);
+                ui.btn_multi.title = src + rewards + ")";
+                
             });
-            ui.btn_multi.title = "" + cash_num * boost_array[4];
+            ui.btn_multi.title = src + GameHelper.getChString(cash_num * boost_array[4]) + ")";
 
             list_1 = new List<item_wheel>() { (ui.wheel.GetChild("wheel_") as wheel_).item_0, (ui.wheel.GetChild("wheel_") as wheel_).item_1, (ui.wheel.GetChild("wheel_") as wheel_).item_2, (ui.wheel.GetChild("wheel_") as wheel_).item_3, (ui.wheel.GetChild("wheel_") as wheel_).item_4, (ui.wheel.GetChild("wheel_") as wheel_).item_5, (ui.wheel.GetChild("wheel_") as wheel_).item_6, (ui.wheel.GetChild("wheel_") as wheel_).item_7, };
             //  list_1[2].img_light.visible = true;
@@ -211,7 +234,7 @@ namespace RedHotRoast
 
         private decimal GetRewardValue(int index = 0)
         {
-            return GetRewardData(index).value;
+            return GetRewardData(index).value / (decimal)GameHelper.GetExchangeRateVo().Multi;;
         }
 
         private RewardOrigin GetRewardOrigin(int index = 0)
@@ -283,13 +306,15 @@ namespace RedHotRoast
                     list_1[i].text_rate.text = "X" + rate_list[i];
                 }
 
-            (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
+                var src = "(";
+                var rewards = GameHelper.getChString((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]);
+                ((wheel_)ui.wheel.GetChild("wheel_")).t1.Play(() =>
                 {
                     rate_idnex++;
-                    ui.btn_multi.title = GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]);
+                    ui.btn_multi.title =src + rewards + ")";
                 });
 
-                (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
+                ((wheel_)ui.wheel.GetChild("wheel_")).t0.Play(Scroll);
 
             }
             else
@@ -337,15 +362,16 @@ namespace RedHotRoast
                 //     (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = 0;
                 //     return;
                 // }
+                var src = "(" ;
 
-            (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
+                ((wheel_)ui.wheel.GetChild("wheel_")).t1.Play(() =>
                 {
                     rate_idnex++;
-                    ui.btn_multi.title = GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]);
+                    ui.btn_multi.title = src + GameHelper.getChString((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]) + ")";
                 });
 
-                (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
+                ((wheel_)ui.wheel.GetChild("wheel_")).t0.Play(Scroll);
-                (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale - 0.3f;
+                ((wheel_)ui.wheel.GetChild("wheel_")).t0.timeScale = ((wheel_)ui.wheel.GetChild("wheel_")).t0.timeScale - 0.3f;
 
             }
 

Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using DG.Tweening;
 using FairyGUI;
 using FGUI.ZM_Sign_06;
+using SGModule.Common.Extensions;
 using Spine.Unity;
 using UnityEngine;
 
@@ -150,6 +151,7 @@ namespace RedHotRoast
             if (signDays > 0)
                 isToday = GameHelper.InToday(DataMgr.SignState.Value[signDays - 1], 0, true);
             
+            btnSign.is_gift.selectedIndex = GameHelper.IsGiftSwitch()? 1 : 0;
             // ui.btn_collect.state.selectedIndex = index == signDays && !(signDays > 0 && isToday)? 0 : 1;
             
             
@@ -213,7 +215,16 @@ namespace RedHotRoast
             var rewardModel = new RewardData();
             for (var i = 0; i < vo.item1.Length; i++)
             {
-                var rewardData = new RewardSingleData(101, vo.quantity[i], RewardOrigin.SignIn,index)
+                var rewardNum = vo.quantity[i];
+                if (GameHelper.IsGiftSwitch())
+                {
+                    rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
+                }
+                else
+                {
+                    rewardNum = GameHelper.Get101Str(vo.quantity[i]).As<decimal>();
+                }
+                var rewardData = new RewardSingleData(101, rewardNum, RewardOrigin.SignIn,index)
                 {
                     startPosition = startPos,
                     endPosition = new Vector2(ui.com_gold.x - 150, ui.com_gold.y - 136)

Assets/Scripts/ToolKit/Language.cs

@@ -12,10 +12,18 @@ public static class Language
 
     public static void Initialize()
     {
-        var lang = PlayerPrefsKit.ReadString("LangIdKey");
+
-        if (lang.IsNullOrWhiteSpace())
-        { 
         var systemLanguage = Application.systemLanguage;
+
+        Debug.Log($"languageInitialize systemLanguage = {systemLanguage}");
+
+        var lang = "en";
+        // if (DataMgr.selectLanguage.Value != -1)
+        // {
+        //     lang = getISOCode((SystemLanguage)DataMgr.selectLanguage.Value);
+        // } 
+        // else
+        // {    
         if (systemLanguage == SystemLanguage.English)
         {
             lang = "en";
@@ -47,12 +55,9 @@ public static class Language
         else if (systemLanguage == SystemLanguage.Russian)
         {
             lang = "ru";
-            } else
-            {
-                lang = "en";
         }
-        }
+        // }
-
+        // lang = "de";
         setCurrentLanguage(lang);
     }
 
@@ -60,7 +65,6 @@ public static class Language
     {
         _currentLanguage = lang;
         PlayerPrefsKit.WriteString("LangIdKey", lang);
-        UIManager.Instance.SetSwitchLanguage(lang);
     }
 
     public static string getCurrentLanguage()