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

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -124,8 +124,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 334.3309, y: 62.687}
+  m_AnchoredPosition: {x: 0.0025177002, y: 0}
+  m_SizeDelta: {x: 750, y: 62.687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710891575198841785
 CanvasRenderer:
@@ -576,7 +576,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:
@@ -3782,7 +3782,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -794,7 +794,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -11.6, y: -1.6}
+  m_AnchoredPosition: {x: -11.6, y: 16}
   m_SizeDelta: {x: 691.4804, y: 160.0778}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929743905255865244
@@ -4834,7 +4834,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/ShopPanel/ShopPanel.prefab

@@ -441,7 +441,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2518, y: -1942}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 1241}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6128091390146622782
 MonoBehaviour:

Assets/Res/UI/WidgetItem.prefab

@@ -534,8 +534,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 19.04669, y: -34.6}
-  m_SizeDelta: {x: 45.5871, y: 25.5237}
+  m_AnchoredPosition: {x: -6.9, y: -33.979}
+  m_SizeDelta: {x: 101.4629, y: 25.5237}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
 CanvasRenderer:
@@ -566,7 +566,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
@@ -578,7 +578,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3
+  m_Text: "3333.33\u4E07"
 --- !u!114 &3965198821937596680
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -216,15 +216,26 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                    if (itemConfig.isVisible == 0)
+                    {
+                        continue;
+                    }
                     cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
 
                 widgetList = await cts.WaitAll();
             }
 
+            int index = 0;
             for (var i = 0; i <  eventList.itemInfos.Count; i++)
             {
-                widgetList[i].InitWidget(new ItemInfo( eventList.itemInfos[i]));
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                if (itemConfig.isVisible == 0)
+                {
+                    continue;
+                }
+                widgetList[index++].InitWidget(new ItemInfo( eventList.itemInfos[i]));
             }
 
 

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

@@ -53,11 +53,12 @@ namespace Fort23.Mono.Phases
         {
             if (actionList.Count > guideIdx)
             {
+                pgm.SetOnClickMask(true);
                 pgm.ResetPlayerGuide();
                 guideIdx++;
                 SaveStep(guideIdx);
                 await actionList[guideIdx](null);
-
+                pgm.SetOnClickMask(false);
                 if (isCompleted)
                 {
                     EventManager.Instance.Dispatch(CustomEventType.GuideComplete, null);

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -74,6 +74,11 @@ namespace Fort23.Mono
             widgetItems.Clear();
             foreach (ItemInfo reward in rewards)
             {
+              
+                if (reward.config.isVisible == 0)
+                {
+                    continue;
+                }
                 GenerateWidget(reward);
             }
         }

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

@@ -103,6 +103,16 @@ namespace Fort23.Mono
             {
                 if (!shopGroupConfig.isShow)
                     continue;
+
+#if UNITY_ANDROID && !UNITY_EDITOR
+                //gm商店不显示
+                if (shopGroupConfig.ID == 1 || shopGroupConfig.ID == 2 || shopGroupConfig.ID == 3)
+                {
+                    continue;
+                }
+#endif
+
+
                 ShopBtnWidget shopBtnWidget =
                     await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
                 shopBtnWidget.CustomInit(shopGroupConfig);
@@ -166,6 +176,14 @@ namespace Fort23.Mono
                     // }
                     else
                     {
+#if UNITY_ANDROID && !UNITY_EDITOR && Taptap
+                        //
+                //付费国内不显示
+                if (shopConfig.shopItemGroup == 5)
+                {
+                    continue;
+                }
+#endif
                         ShopGroupWidgetType1 shopGroupWidgetType1 =
                             await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(
                                 ShopGroupWidgetType2,

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -98,15 +98,28 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                    if (itemConfig.isVisible == 0)
+                    {
+                        continue;
+                    }
+
                     cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
 
                 widgetItems = await cts.WaitAll();
             }
 
+            int index = 0;
             for (var i = 0; i < eventList.itemInfos.Count; i++)
             {
-                widgetItems[i].InitWidget(new ItemInfo(eventList.itemInfos[i]));
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
+                if (itemConfig.isVisible == 0)
+                {
+                    continue;
+                }
+
+                widgetItems[index++].InitWidget(new ItemInfo(eventList.itemInfos[i]));
             }
         }