lzx 3 dni temu
rodzic
commit
51836012b2

+ 1 - 1
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.22000463
+    - _Alpha: 0.000063378386
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 35 - 31
Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38511,6 +38511,10 @@
     {
       "ID": 10368,
       "txt": "购买"
+    },
+    {
+      "ID": 10369,
+      "txt": "限购次数:{0}"
     }
   ]
 }

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 1 - 1
Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -1050,7 +1050,7 @@ namespace Fort23.Mono
 
             if (uiPanel.IsShowCustomBGPanel) //如果是开了背景的界面关闭的时候将背景一起关闭
             {
-                HideUIUIPanel(GetComponent(BackgroundPanelType) as UIPanel, UIDestroyType.NotDestroy);
+                await HideUIUIPanel(GetComponent(BackgroundPanelType) as UIPanel);
             }
             // CloseTopUI();
             // OpenTopUI();

+ 1 - 1
Assets/Scripts/GameUI/GameApplction.cs

@@ -197,7 +197,7 @@ public class GameApplction : IGameStart
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
             MainPanel mainPanel = await MainPanel.OpenPanel();
-            if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
+            if (!AccountFileInfo.Instance.playerData.isTiggerPlot && PlayerGuideManager.Instance.GuideIsCanDo(1))
             {
                 mainPanel.GObjectPoolInterface.SetActive(false);
                 AppBarPanel.ClosePanel();

+ 6 - 6
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -209,8 +209,8 @@ namespace Fort23.Mono
             if (nextSmallPlacesData == null && IsSmallPlacesDataUlock(smallPlacesConfig.ID + 1))
             {
                 isChange = true;
-                UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
-                UIManager.Instance.HideUIUIPanel(this);
+                await UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
+                await UIManager.Instance.HideUIUIPanel(this);
 
                 //切换下一个地图
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
@@ -260,14 +260,14 @@ namespace Fort23.Mono
 
                 if (smallPlacesConfig.ID == PlayerManager.Instance.CurrentsmallPlaces.id)
                 {
-                    UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
-                    UIManager.Instance.HideUIUIPanel(this);
+                    await UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
+                    await UIManager.Instance.HideUIUIPanel(this);
                     return;
                 }
 
                 isChange = true;
-                UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
-                UIManager.Instance.HideUIUIPanel(this);
+                await UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
+                await UIManager.Instance.HideUIUIPanel(this);
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
 
                 callBack?.Invoke(true);

BIN
Excel2Json/Excel/Language.xlsx