فهرست منبع

任务文本本地话

ybx_Gdn 11 ماه پیش
والد
کامیت
18916a65d3

+ 2 - 1
Assets/Content/Config/GlobalCfg.csv

@@ -349,4 +349,5 @@ int,string,int,string,float
 362,挑戰者大廳購買次數消耗,,2:50000;2:60000;2:80000;2:100000;2:120000;2:150000,
 363,最大關卡ID,580100,,
 364,远航可购买次数,5,,
-365,解锁噩梦,280001,,
+365,解锁噩梦,280001,,
+366,噩梦解锁进度,270100,,

+ 16 - 1
Assets/Content/Prefabs/UI/UITask/DiffTaskItem.prefab

@@ -1861,6 +1861,7 @@ GameObject:
   - component: {fileID: 6075085159758486489}
   - component: {fileID: 5625801360294600810}
   - component: {fileID: 8059462986712496936}
+  - component: {fileID: 6299912918014411091}
   m_Layer: 5
   m_Name: Number
   m_TagString: Untagged
@@ -1914,7 +1915,8 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UINode
   - TMPro.TextMeshProUGUI
-  values: 00000001
+  - UILocalizeScript
+  values: 0000000100
   depObjs:
   - {fileID: 5328069431028710917}
   activeType: 0
@@ -2008,6 +2010,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &6299912918014411091
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6075085159758486484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnGet
 --- !u!1 &6925702169425509602
 GameObject:
   m_ObjectHideFlags: 0

+ 16 - 1
Assets/Content/Prefabs/UI/UITask/UIDiffTask.prefab

@@ -2131,6 +2131,7 @@ GameObject:
   - component: {fileID: 4347792847699498852}
   - component: {fileID: 8509728357911056414}
   - component: {fileID: 5466650825250161053}
+  - component: {fileID: 632185375271846657}
   - component: {fileID: 6190046031259627152}
   m_Layer: 5
   m_Name: Number
@@ -2185,10 +2186,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UINode
   - TMPro.TextMeshProUGUI
-  values: 00000001
+  - UILocalizeScript
+  values: 0000000100
   depObjs:
   - {fileID: 6895392935432831860}
   activeType: 0
+--- !u!114 &632185375271846657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6045587113184010372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnGet
 --- !u!114 &6190046031259627152
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 4 - 1
Assets/Lua/UI/UIBattle/UIBattleView.lua

@@ -848,7 +848,10 @@ function UIBattleView:OnClickChallengeBtn(btn)
 	self:DisposeNewLevelIncrease()
 
 	local Levelmaxlvid = GlobalConfig.Instance:GetConfigIntValue(363)
-	if(ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId() >= Levelmaxlvid) then
+	local dif_s_lid = ManagerContainer.LuaBattleMgr:GetCurDiff_S_LvID()
+	local IsDiff_s_Limit =  ManagerContainer.LuaBattleMgr:GetBattleMode() == 2 and dif_s_lid >= GlobalConfig.Instance:GetConfigIntValue(366)
+
+	if(ManagerContainer.LuaBattleMgr:GetCurLevelUniqueId() >= Levelmaxlvid) or IsDiff_s_Limit then
 		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("289")
 		return
 	end