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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -219,7 +219,7 @@ namespace Fort23.Mono
         }
 
 
-        //public CTask CloseAwaitTask;
+        public CTask CloseAwaitTask;
         /// <summary>
         /// 关闭界面
         /// </summary>

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -48,7 +48,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
-                currentOpenUIPanel = null;
+                // currentOpenUIPanel = null;
             });
         }
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -141,6 +141,7 @@ namespace Fort23.Mono
                     {
                         daoYouData.loveIds.Add(daoyouGiftConfig.ItemID);
                     }
+
                     //加经验
                     for (int i = 0; i < count; i++)
                     {
@@ -148,8 +149,6 @@ namespace Fort23.Mono
                         daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
                     }
 
-           
-
 
                     DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
 
@@ -389,7 +388,7 @@ namespace Fort23.Mono
             foreach (var itemInfo in shownItems)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
-                widgetItem.InitWidget(itemInfo);
+                widgetItem.InitWidget(itemInfo, false);
                 widgetItem.OnClick = OnClick;
                 giveWidgetItems.Add(widgetItem);
             }

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

@@ -13,6 +13,7 @@ namespace Fort23.Mono
     public partial class WidgetItem : ItemWidgetBasic
     {
         public ItemInfo itemInfo;
+        public bool isClick = false;
 
 
         private void Init()
@@ -31,6 +32,8 @@ namespace Fort23.Mono
         {
             Btn_WidgetItem.onClick.AddListener(() =>
             {
+                if(!isClick)
+                    return;
                 if (itemInfo.config.associateID == 3)
                 {
        
@@ -50,8 +53,9 @@ namespace Fort23.Mono
         }
 
 
-        public void InitWidget(ItemInfo itemInfo)
+        public void InitWidget(ItemInfo itemInfo,bool isclick = true)
         {
+            this.isClick = isclick;
             this.itemInfo = itemInfo;
 
             icon.gameObject.SetActive(true);
@@ -71,6 +75,7 @@ namespace Fort23.Mono
 
         public void ShowWenhao()
         {
+            isClick = false;
             Icon_WenHao.gameObject.SetActive(true);
             icon.gameObject.SetActive(false);
             Text_Count.gameObject.SetActive(false);

ProjectSettings/HybridCLRSettings.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e189374413a3f00468e49d51d8b27a09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  enable: 1
+  enable: 0
   useGlobalIl2cpp: 0
   hybridclrRepoURL: https://gitee.com/focus-creative-games/hybridclr
   il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus

ProjectSettings/ProjectSettings.asset

@@ -186,7 +186,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.fort23.xy001
+    Android: com.taptap.xy.yousanjie
     Standalone: com.DefaultCompany.XY002
   buildNumber:
     Standalone: 0
@@ -282,20 +282,20 @@ PlayerSettings:
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
-  useCustomMainManifest: 1
+  useCustomMainManifest: 0
   useCustomLauncherManifest: 0
-  useCustomMainGradleTemplate: 1
-  useCustomLauncherGradleManifest: 1
-  useCustomBaseGradleTemplate: 1
-  useCustomGradlePropertiesTemplate: 1
-  useCustomGradleSettingsTemplate: 1
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 3
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: '{inproject}: xy001.keystore'
-  AndroidKeyaliasName: com.fort23.xy001
+  AndroidKeystoreName: '{inproject}: taptap.keystore'
+  AndroidKeyaliasName: com.taptap.xy.yousanjie
   AndroidEnableArmv9SecurityFeatures: 0
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0