提交

Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs

@@ -205,6 +205,10 @@ namespace BingoBrain
             }
             if (GameHelper.GetCommonModel().PiggyBankSwitch != 1) ui.btn_saveingpot.visible = false;
             Debug.Log(JsonConvert.SerializeObject(GameHelper.GetConfig<AdRewardModel>().dataList));
+            ui.btn_pal.SetClick(() =>
+            {
+                  UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open);
+            });
         }
 
         private void UpdateNextCardBoardTime()

Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs

@@ -10,6 +10,7 @@ using BingoBrain.Core;
 using FGUI.ACommon;
 using FairyGUI;
 using BingoBrain.HotFix;
+using System.Text.RegularExpressions;
 
 namespace BingoBrain
 {
@@ -52,6 +53,7 @@ namespace BingoBrain
 
         protected override void OnOpenBefore(object args)
         {
+            broad_text = Regex.Replace(GameHelper.getDesByKey("makeup_4"), @"<img\s+[^>]*?/>", "<img src='ui://pmf3wbjidz5jpj6'/>");
             InitView();
             //ui.y = 241;
 
@@ -121,14 +123,14 @@ namespace BingoBrain
 
             // var sk = FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad,  closeCallback);
             // sk.state.SetAnimation(0, "animation", true);
-            FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
-            {
-                // ske_pot = sk;
+            // FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
+            // {
+            //     // ske_pot = sk;
 
-                //   NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
-                // OnChangeCardFinish(null);
-                NAAVsa.PlayAnim(sk, "animation", true);
-            }, closeCallback);
+            //     //   NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
+            //     // OnChangeCardFinish(null);
+            //     NAAVsa.PlayAnim(sk, "animation", true);
+            // }, closeCallback);
 
             // ui.group_.y = 220;
 
@@ -166,6 +168,7 @@ namespace BingoBrain
         {
             ui.group_.y = GRoot.inst.height - 300;
         }
+        string broad_text = "";
         void timeEvent()
         {
             time_count++;
@@ -188,8 +191,9 @@ namespace BingoBrain
             // }
 
             // time_count = 0;
+            //[color=#63f021][size=32]{0}[/size][/color] claimed <img src='ui://pmf3wbji112epi7'/>[color=#009900][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color]
 
-
+            //  Debug.Log(GameHelper.getDesByKey("makeup_4"));
             //Debug.Log($"barry  broad time count======== {time_count}");
             if (time_count > 20)
             {
@@ -203,9 +207,12 @@ namespace BingoBrain
                 {
                     name = name[..4] + "...";
                 }
-               // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4");
-                string broad_text = String.Format(GameHelper.getDesByKey("makeup_4"), name, GameHelper.Get102Str_new(decimal.Parse( config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime());
-                text_ui.cast_text.text = broad_text;
+                // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4");
+
+
+
+                string temp_text = String.Format(broad_text, name, GameHelper.Get102Str_new(decimal.Parse(config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime());
+                text_ui.cast_text.text = temp_text;
                 ui.t0.Play();
 
                 DOVirtual.DelayedCall(3.5f, () =>

Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs

@@ -167,7 +167,7 @@ namespace BingoBrain
             // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
             GameHelper.PostFunnelLogin("enterButtonClick");
             ctrlDispatcher.Dispatch(CtrlMsg.Game_Start);
-
+            if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open);
             CtrlCloseUI();
         }
 

Assets/BingoBrain/ModuleUI/Pal.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c30937b710555294d8045052a0d9712c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs

@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PalCtrl : BaseCtrl
+    {
+        public static PalCtrl Instance { get; private set; }
+
+        private PalModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}

Assets/BingoBrain/ModuleUI/Pal/PalCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa2b2f6680825b04f941dfa669ad3ed7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/ModuleUI/Pal/PalModel.cs

@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PalModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}

Assets/BingoBrain/ModuleUI/Pal/PalModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2db57b7b73c78574b85db16295855638
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/ModuleUI/Pal/PalUI.cs

@@ -0,0 +1,98 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using FairyGUI;
+using FGUI.ACommon;
+using FGUI.JMain;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class PalUI : BaseUI
+    {
+        private PalUICtrl ctrl;
+        private PalModel model;
+        private FGUI.JMain.com_pal ui;
+
+        public PalUI(PalUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.PalUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JMain";
+            uiInfo.assetName = "com_pal";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnClose()
+        {
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JMain.com_pal;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            ui.list_pal.itemRenderer = RendererList;
+            ui.list_pal.numItems = 2;
+
+
+            ui.list_pal.scrollPane.onScrollEnd.Add(() =>
+            {
+                int index = ui.list_pal.GetFirstChildInView();
+
+                ui.state.selectedIndex = index;
+            });
+            ui.btn_close.SetClick(CtrlCloseUI);
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+        void RendererList(int index, GObject obj)
+        {
+            item_pal item = obj as item_pal;
+            item.state.selectedIndex = index;
+
+        }
+        //初始化页面逻辑
+        private void InitView()
+        {
+
+        }
+    }
+}

Assets/BingoBrain/ModuleUI/Pal/PalUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 94c75695fa5b4964c8e7be3f52fbb99d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs

@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class PalUICtrl : BaseUICtrl
+    {
+        private PalUI ui;
+        private PalModel model;
+
+        private uint openUIMsg = SkinInfo.PalUI_Open;
+        private uint closeUIMsg = SkinInfo.PalUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new PalUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}

Assets/BingoBrain/ModuleUI/Pal/PalUICtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f59034f142a0ceb4891d4a541c350d35
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BingoBrain/ModuleUI/RecordView/RecordViewUI.cs

@@ -7,6 +7,7 @@ using DG.Tweening;
 using FairyGUI;
 using FGUI.ACommon;
 using FGUI.bkg_jilu;
+using NSubstitute.ReturnsExtensions;
 using UnityEngine;
 
 namespace BingoBrain
@@ -129,7 +130,19 @@ namespace BingoBrain
             string[] values = ctrl.model.recordList[index].Split('-');
 
             item.name.text = values[0];
+
             item.num.text = GameHelper.getChString(decimal.Parse(values[1]));
+
+            if (GameHelper.isRDExchangeMode())
+            {
+                string str = "<img src='ui://pmf3wbjidz5jpj6'/>";
+                item.num.text = str + $" {decimal.Parse(values[1]):N}";
+            }
+            else
+            {
+                item.num.text = $"${decimal.Parse(values[1]):N}";
+
+            }
             string[] parts = values[2].Split(" ");
             item.time.text = parts[0];
             item.lab_claim.text = GameHelper.getDesByKey("ww");

Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs

@@ -70,7 +70,7 @@ namespace BingoBrain
             SetName();
             ui.settings.SetClick(OnClickSetting);
             ui.com_avatar.loader_flag.visible = false;
-            if(GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex=1;
+            if (GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex = 1;
             if (GameHelper.IsGiftSwitch())
             {
                 // ui.visible = false;
@@ -78,8 +78,16 @@ namespace BingoBrain
             }
             if (Screen.safeArea.y != 0)
             {
-                ui.top_group.y=-90;
+                ui.top_group.y = -90;
             }
+            ui.btn_coin.SetClick(() =>
+            {
+                GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1);
+            });
+            ui.btn_cash.SetClick(() =>
+            {
+                GameDispatcher.Instance.Dispatch(BingoInfo.MainTab, 1);
+            });
         }
 
         private void OnClickSetting()