lzx 6 時間 前
コミット
191f524655

+ 1 - 1
Assets/Res/Config/UnlockConfig.json

@@ -12,7 +12,7 @@
       "ID": 2,
       "ulockFunction": 2,
       "ulockCondition": 1,
-      "ulockValue": 10,
+      "ulockValue": 31,
       "lockType": 2,
       "UnlockTipsID": 10801
     }

+ 14 - 0
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -1801,6 +1801,7 @@ GameObject:
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
   - component: {fileID: 8212985562436809507}
+  - component: {fileID: 2207485977598712761}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: fanhuiButton
@@ -1939,6 +1940,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &2207485977598712761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4418083923053840122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7334e4a874a3af244b6ba80884842db4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uLockFunction: 2
 --- !u!1 &4470634333790369813
 GameObject:
   m_ObjectHideFlags: 0

+ 9 - 1
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -140,7 +140,15 @@ namespace Fort23.Mono
 
             Text_Level.text =
                 LanguageManager.Instance.Text(10251, AccountFileInfo.Instance.playerData.divineSenseLevel);
-            Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/{divineSenseConfig.exp}";
+            if (AccountFileInfo.Instance.playerData.divineSenseLevel >= 20)
+            {
+                Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/MAX";
+            }
+            else
+            {
+                Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/{divineSenseConfig.exp}";
+            }
+           
             Slider_Exp.maxValue = divineSenseConfig.exp;
             Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;
 

+ 1 - 0
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -346,6 +346,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            UIManager.Instance.GetComponent<AppBarPanel>().Back();
             pgm.SetBlackBaseVisiable(false);
             ForceGuideOver();
         }

BIN
Excel2Json/Excel/Unlock.xlsx