Jelajahi Sumber

部分聊天ui语言

ybx_Gdn 1 tahun lalu
induk
melakukan
6d56b5233b

File diff ditekan karena terlalu besar
+ 54 - 12
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 56 - 0
Assets/Content/Prefabs/UI/UIBattle/NewBattleChat.prefab

@@ -249,6 +249,7 @@ GameObject:
   - component: {fileID: 5072972545684012030}
   - component: {fileID: 4137430904168159578}
   - component: {fileID: 3953149989303109315}
+  - component: {fileID: 1268540221071809212}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -374,6 +375,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1268540221071809212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 468665296376207743}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: ChlWarlog
 --- !u!1 &491069702093731203
 GameObject:
   m_ObjectHideFlags: 0
@@ -2807,6 +2821,7 @@ GameObject:
   - component: {fileID: 2233647255768386576}
   - component: {fileID: 3072768987961310484}
   - component: {fileID: 2136789657235288354}
+  - component: {fileID: 3567643857425855041}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2932,6 +2947,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &3567643857425855041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999173004034233653}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: ChlSystem
 --- !u!1 &3356672410924349243
 GameObject:
   m_ObjectHideFlags: 0
@@ -5802,6 +5830,7 @@ GameObject:
   - component: {fileID: 7277158661014362266}
   - component: {fileID: 2806098215235470658}
   - component: {fileID: 2965566527404645480}
+  - component: {fileID: 1849412595397307376}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -5927,6 +5956,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1849412595397307376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8493057194835208244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: ChlGuild
 --- !u!1 &8554877775338622473
 GameObject:
   m_ObjectHideFlags: 0
@@ -6422,6 +6464,7 @@ GameObject:
   - component: {fileID: 2295455862316306071}
   - component: {fileID: 7021695877579575205}
   - component: {fileID: 5459182310221045935}
+  - component: {fileID: 2364094286856145895}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -6547,6 +6590,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &2364094286856145895
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9149156169092745485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: ChlWorld
 --- !u!1001 &8334092510501994258
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 3 - 1
Assets/Lua/UI/Common/ConditionJudge.lua

@@ -38,7 +38,9 @@ JudgeFun[11] = function(condition)
         return false, val, ''
     end
     
-    local content = I18N.SetLanguageValue("FunUnLock11", I18N.T(levelData.Name))
+    local mapdata = ManagerContainer.CfgMgr:GetMapData(levelData.MapId)
+
+    local content = I18N.SetLanguageValue("FunUnLock11", I18N.T(mapdata.Name)..' '..levelData.LevelId)
     local uniId = ManagerContainer.LuaBattleMgr:GetCurSimpleLvID()--GetCurLevelUniqueId()
     --LogError("==========targetLv========"..val.."=============CurLv===="..uniId.."==="..content)
     return uniId >= val, val, content

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini