修改bug

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 8027710173212846871}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3639,6 +3639,7 @@ RectTransform:
   m_Children:
   - {fileID: 2394298463810824802}
   - {fileID: 8010219124151300276}
+  - {fileID: 5165456385084390663}
   - {fileID: 1713729240865209901}
   - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
@@ -4195,7 +4196,7 @@ GameObject:
   - component: {fileID: 9215601903000794814}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4271,6 +4272,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7840973239030215349
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5165456385084390663}
+  - component: {fileID: 1035588383843407233}
+  - component: {fileID: 4903205536107700407}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_EventSuo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5165456385084390663
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -18.149994, y: -11.5}
+  m_SizeDelta: {x: 22, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &1035588383843407233
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_CullTransparentMesh: 1
+--- !u!114 &4903205536107700407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7840973239030215349}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_map_suo
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e09f56329289dea619e61cb78606497c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8048350266640076490
 GameObject:
   m_ObjectHideFlags: 0
@@ -5420,6 +5510,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_EventSuo
+    gameObject: {fileID: 4903205536107700407}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2784359978076376180
 PrefabInstance:

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -438,6 +438,51 @@ namespace Fort23.Mono
                 Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
                 Text_EventTag.text = EventHelper.GetEventType(randomEventConfig.EventTag);
 
+
+                SmallPlacesConfig smallPlacesConfig =
+                    ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+                bool isUlock = true;
+                if (randomEventConfig.SmallPlacesId > 0)
+                {
+                    if (randomEventConfig.SmallPlacesId != PlayerManager.Instance.CurrentsmallPlaces.id)
+                    {
+                        AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+                            PlayerManager.Instance.GetSmallPlacesData(randomEventConfig.SmallPlacesId - 1);
+                        SmallPlacesConfig lastSmallPlacesConfig =
+                            ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId - 1);
+
+                        SmallPlacesConfig currentSmallPlacesConfig =
+                            ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
+                        if (currentSmallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                                                lastSmallPlacesData.completionEventCount <
+                                                                lastSmallPlacesConfig.CompletionEventCount))
+                        {
+                            isUlock = false;
+                        }
+
+                        if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+                        {
+                            AccountFileInfo.EventList eventList1 =
+                                AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                                    ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                            if (eventList1 == null || !eventList1.isCompleted)
+                            {
+                                isUlock = false;
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                // else if (randomEventConfig.placeID > 0)
+                // {
+                //     if (randomEventConfig.placeID != smallPlacesConfig.PlacesId)
+                //     {
+                //         
+                //     }
+                // }
+                Icon_EventSuo.gameObject.SetActive(!isUlock);
+
                 AccountFileInfo.EventLinkData eventLinkData =
                     eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -329,6 +329,17 @@ namespace Fort23.Mono
 	      return _fx_ui_fengling_loop;
 	     }
 	   }
+	  private MyImage _Icon_EventSuo;
+	  public MyImage Icon_EventSuo
+	   {
+	   get{
+	      if (_Icon_EventSuo == null)
+	       {
+	         _Icon_EventSuo  = GetUIUnit<MyImage>("Icon_EventSuo"); 
+	       }
+	      return _Icon_EventSuo;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -73,6 +73,8 @@ namespace Fort23.Mono
 
                 RewardsPanel.OpenPanel(itemInfos);
                 CustomInit();
+                
+                RedDotManager.Instance.AllRedDotUpDate();
             });
 
             Btn_XiangQing.onClick.AddListener(() => { QiankundaiInfoPanel.OpenPanel(); });
@@ -97,12 +99,37 @@ namespace Fort23.Mono
                 LanguageManager.Instance.Text(10172,
                     UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
                     UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
+    
+            
+            
+            //可以掉落每日刷新奖励
+            if (TimeHelper.ClientNow() >= AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime)
+            {
+                List<QiankundaiConfig> qiankundaiConfigs = PlayerManager.Instance.GetFixedTimeQiankundaiConfigs();
+                foreach (var qiankundaiConfig in qiankundaiConfigs)
+                {
+                    for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
+                    {
+                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                            qiankundaiConfig.DropCount[i]);
+                        foreach (var info in itemInfo)
+                        {
+                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            widgetItem.InitWidget(info);
+                            items.Add(widgetItem);
+                        }
+                    }
+                }
+            }
+            
+            
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                 widgetItem.InitWidget(new ItemInfo(playerDataQiankundaiItemData));
                 items.Add(widgetItem);
             }
+
         }
 
         public static async CTask OpenPanel()