Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.49591115
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.85893416
+    - _Alpha: 0.08040106
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.49063802
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.22046483
+    - _Alpha: 0.22354835
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.18773782
+    - _MainTexOffsetU: 0.18412375
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -548,6 +548,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     //添加事件
     public AccountFileInfo.EventList AddEvent(int eventID)
     {
+
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventID);
         AccountFileInfo.EventList eventList = null;
         if (eventConfig.ID == 0)
@@ -753,7 +754,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         LanguageManager.Instance.Text(10379,
                             lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount));
 
-                    if (eventConfig.ID == 10003 && PlayerGuideManager.Instance.GuideIsCanDo(3))
+                    if (eventConfig.ID == 10002 && PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
                         PlayerGuideManager.Instance.SetGuid(3);
                     }
@@ -1121,6 +1122,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (evt.EventConditionId == null)
             return true;
 
+        bool isCan = true;
         for (var i = 0; i < evt.EventConditionId.Length; i++)
         {
             switch (evt.EventConditionId[i])
@@ -1132,7 +1134,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         return false;
                     }
 
-                    return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
+                    if (PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i])
+                    {
+                        isCan = false;
+                        return false;
+                    }
+
+                    break;
                 //境界判断
                 case 3:
                     if (evt.EventValue == null)
@@ -1140,7 +1148,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         return false;
                     }
 
-                    return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
+                    if (PlayerManager.Instance.myHero.level < evt.EventValue[i])
+                    {
+                        isCan = false;
+                        return false;
+                    }
+
+                    break;
+
                 //概率判断
                 case 7:
                     if (evt.EventValue == null)
@@ -1150,7 +1165,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
                     int randomValue1 = Random.Range(0, 1001);
 
-                    return randomValue1 <= evt.EventValue[i];
+                    if (randomValue1 > evt.EventValue[i])
+                    {
+                        isCan = false;
+                        return false;
+                    }
+
+                    break;
                 //完成事件判断
                 case 10:
                     if (evt.EventValue == null)
@@ -1161,12 +1182,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
-                    return eventList != null;
+                    if (eventList == null)
+                    {
+                        isCan = false;
+                        return false;
+                    }
+
+                    break;
             }
         }
 
 
-        return true;
+        return isCan;
     }
 
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase7.cs

@@ -158,6 +158,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep704(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            pgm.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject = UIManager.Instance.GetComponent<ShopPanel>()._shopBtnWidgets[1].own;
@@ -171,6 +172,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            pgm.SetOnClickMask(false);
         }
 
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -36,6 +36,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             return base.GetFocus();
         }
 
@@ -89,14 +90,11 @@ namespace Fort23.Mono
                 // UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
             });
 
-            Btn_LingQu.onClick.AddListener(() =>
+            Btn_LingQu.onClick.AddListener(async () =>
             {
-                UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
+                 UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
+
                 
-                if (PlayerGuideManager.Instance.GuideIsCanDo(7, 3))
-                {
-                    PlayerGuideManager.Instance.NextGuide();
-                }
             });
         }
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -42,9 +42,12 @@ namespace Fort23.Mono
         }
 
 
+        private CTask _cTask;
+
         public async override CTask GetFocus()
         {
             AppBarPanel.OpenPanel(this);
+            _cTask = CTask.Create();
             if (currentSelectedShopBtnWidget == null)
             {
                 foreach (var shopBtnWidget in _shopBtnWidgets)
@@ -70,6 +73,7 @@ namespace Fort23.Mono
                 currentSelectedShopBtnWidget.OnPointerClick();
             }
 
+            await _cTask;
             if (PlayerGuideManager.Instance.GuideIsCanDo(7))
             {
                 await PlayerGuideManager.Instance.SetGuid(7);
@@ -125,8 +129,6 @@ namespace Fort23.Mono
 
         private async void OnClick(ItemWidgetBasic obj)
         {
-       
-
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
             TitlePanel.OpenPanel(shopBtnWidget.ShopGroupConfig.titleShowItemIds.ToList());
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
@@ -174,11 +176,17 @@ namespace Fort23.Mono
                 }
             }
 
+            _cTask?.SetResult();
             if (PlayerGuideManager.Instance.GuideIsCanDo(7, 1))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
-            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 4))
+
+            if (PlayerGuideManager.Instance.GuideIsCanDo(7, 3))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
+            else if (PlayerGuideManager.Instance.GuideIsCanDo(7, 4))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }