bingo b面修改

Assets/BingoBrain/Model/Game/CardBoardEntity.cs

@@ -180,7 +180,7 @@ namespace BingoBrain
             if (gameObjTransform != null)
             {
                 gameObjTransform.localPosition = originPos + new Vector3(index / BingoCell.bingoCount * offset,
-                    index % BingoCell.bingoCount * -offset);
+                    index % BingoCell.bingoCount * -(offset + 0.02f));
             }
             else
             {
@@ -465,10 +465,10 @@ namespace BingoBrain
         public int IsBingo(List<int> selectList)
         {
             foreach (var kv in from kv in BingoCell.bingoDic
-                     where !bingoedList.Contains(kv.Key)
-                     let isAllMatch = kv.Value.All(selectList.Contains)
-                     where isAllMatch
-                     select kv)
+                               where !bingoedList.Contains(kv.Key)
+                               let isAllMatch = kv.Value.All(selectList.Contains)
+                               where isAllMatch
+                               select kv)
             {
                 return kv.Key;
             }

Assets/BingoBrain/Model/Game/CardEntity.cs

@@ -6,7 +6,7 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using Spine;
-
+using UnityEngine.UI;
 namespace BingoBrain
 {
     public class CardEntity
@@ -14,7 +14,7 @@ namespace BingoBrain
         public CardData data = new CardData();
         public GameCell Game = new GameCell();
         private TextMeshPro text;
-        private TextMeshPro alphaNum;
+        private SpriteRenderer alphaNum;
         private GameObject selectStar;
         private GameObject coin;
 
@@ -34,24 +34,24 @@ namespace BingoBrain
                     selectStar = Game.transform.Find("selectStar").gameObject;
                     reward = Game.transform.Find("reward");
                     coin = Game.transform.Find("coin").gameObject;
-                    alphaNum = text.transform.GetChild(0).GetComponent<TextMeshPro>();
+                    alphaNum = text.transform.GetChild(0).GetComponent<SpriteRenderer>();
                     Game.transform.localScale = Vector3.one * 1.04f;
                     TriggerBingo.Get(Game.gameObject).onClick = OnClick;
-                    alphaNum.alpha = 0;
+                    alphaNum.color = new Color(1f, 1f, 1f, 0f);
                     action?.Invoke();
                 });
             }
             else
             {
-                alphaNum.alpha = 0;
+                alphaNum.color = new Color(1f, 1f, 1f, 0f);
                 action?.Invoke();
             }
         }
 
         public void SetByData()
         {
-            alphaNum.text = text.text = GameHelper.GetNum(data.num);
-
+            // alphaNum.text = text.text = GameHelper.GetNum(data.num);
+            text.text = GameHelper.GetNum(data.num);
             if (data.cardBoard.data.selectList.Contains(data.index))
             {
                 data.isSelect = true;
@@ -96,7 +96,7 @@ namespace BingoBrain
             alphaTween?.Pause();
             delayedCall?.Kill();
             delayedCall = null;
-            alphaNum.alpha = 0;
+            alphaNum.color = new Color(1f, 1f, 1f, 0f);
             data.cardBoard.isFinish = false;
             data.cardBoard.isBingoing = false;
             data.isSelect = false;
@@ -164,7 +164,7 @@ namespace BingoBrain
                 }
 
                 alphaTween?.Pause();
-                alphaNum.alpha = 0;
+                alphaNum.color = new Color(1f, 1f, 1f, 0f);
                 var effect = Battle.Instance.ShungTik.Get("Effect.spark.fx_number_enter", "fx_number_enter");
                 effect.transform.SetParent(Game.transform, false);
                 DOVirtual.DelayedCall(1, () => { ReleaseEffect(effect); }).SetAutoKill();
@@ -212,7 +212,7 @@ namespace BingoBrain
                 case CardPropType.cashx3:
                     rewardSingleData.id = 102;
                     rewardData.AddReward(rewardSingleData);
-                    if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Open,true);
+                    if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Open, true);
                     else GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData);
                     break;
                 case CardPropType.fanpai:

Assets/BingoBrain/Model/Game/Preferences_Logic.cs

@@ -283,8 +283,8 @@ namespace BingoBrain
         public int h5StayTime;
         public decimal makeupTaskH5Time;
 
-        public List<MakeupTaskData> makeupTaskHistory;
-        public List<MakeupTaskData> coinMakeupTaskHistory;
+         public List<MakeupTaskData> makeupTaskHistory;
+         public List<MakeupTaskData> coinMakeupTaskHistory;
         public decimal coinMakeupTaskH5Time;
     }
 }