ybx_Gdn 10 månader sedan
förälder
incheckning
93ee9f2c1e

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1107 - 49
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 93 - 9
Assets/Content/Prefabs/UI/UIChat/UIChat.prefab

@@ -1050,9 +1050,9 @@ RectTransform:
   m_Father: {fileID: 2656721342893615607}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 310, y: -38}
   m_SizeDelta: {x: 204, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1034206127871892710
@@ -2030,9 +2030,9 @@ RectTransform:
   m_Father: {fileID: 2656721342893615607}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 514, y: -38}
   m_SizeDelta: {x: 204, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2656721342129378172
@@ -3280,9 +3280,9 @@ RectTransform:
   m_Father: {fileID: 2656721342893615607}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 106, y: -38}
   m_SizeDelta: {x: 204, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2656721342782321415
@@ -3717,6 +3717,7 @@ GameObject:
   - component: {fileID: 2656721342925548982}
   - component: {fileID: 2656721342925548980}
   - component: {fileID: 2656721342925548983}
+  - component: {fileID: 7417059388990093351}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -3786,6 +3787,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7CFB\u7D71"
+--- !u!114 &7417059388990093351
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2656721342925548977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatSystem
 --- !u!1 &2656721342925813563
 GameObject:
   m_ObjectHideFlags: 0
@@ -4053,6 +4067,7 @@ GameObject:
   - component: {fileID: 2656721343055105690}
   - component: {fileID: 2656721343055105701}
   - component: {fileID: 5880786401904470070}
+  - component: {fileID: 3336202980112297264}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -4137,6 +4152,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.23529412}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &3336202980112297264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2656721343055105703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatSystem
 --- !u!1 &2656721343109018953
 GameObject:
   m_ObjectHideFlags: 0
@@ -5579,6 +5607,7 @@ GameObject:
   - component: {fileID: 2656721343772232116}
   - component: {fileID: 2656721343772232119}
   - component: {fileID: 557916999934480486}
+  - component: {fileID: 5998993990844592052}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -5663,6 +5692,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.23529412}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &5998993990844592052
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2656721343772232113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatWorld
 --- !u!1 &2656721343775828631
 GameObject:
   m_ObjectHideFlags: 0
@@ -5674,6 +5716,7 @@ GameObject:
   - component: {fileID: 2656721343775828628}
   - component: {fileID: 2656721343775828618}
   - component: {fileID: 2656721343775828629}
+  - component: {fileID: 8185965270732042819}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -5743,6 +5786,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E16\u754C"
+--- !u!114 &8185965270732042819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2656721343775828631}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatWorld
 --- !u!1 &2656721343786108990
 GameObject:
   m_ObjectHideFlags: 0
@@ -6560,6 +6616,7 @@ GameObject:
   - component: {fileID: 5144892252608161452}
   - component: {fileID: 5772165769280810868}
   - component: {fileID: 2563821675384209378}
+  - component: {fileID: 8973664339338587214}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -6629,6 +6686,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u516C\u6703"
+--- !u!114 &8973664339338587214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4680535795978763597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatGuild
 --- !u!1 &5073158933342272306
 GameObject:
   m_ObjectHideFlags: 0
@@ -7031,6 +7101,7 @@ GameObject:
   - component: {fileID: 6124193197010280085}
   - component: {fileID: 5553909631097405114}
   - component: {fileID: 928048173922761754}
+  - component: {fileID: 173493363893913232}
   m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
@@ -7115,6 +7186,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.23529412}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &173493363893913232
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6082879184770471655}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnChatGuild
 --- !u!1 &6230070522069679405
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 2
Assets/Editor/CsvToLua/CfgLanguageCfg.csv

@@ -19,8 +19,8 @@
 18,EquipSuitNewCfg,Name,ESNCfg_Name_,1,0
 19,ExpeditionBuffCfg,Desc,EBCfg_Desc_,1,0
 20,ExpeditionBuffCfg,Name,EBCfg_Name_,1,0
-21,FashionCfg,FashionName,FCfg_FashionName_,1,1
-22,FashionCfg,FashionDepict,FCfg_FashionDepict_,1,1
+21,FashionCfg,FashionName,FCfg_FashionName_,1,0
+22,FashionCfg,FashionDepict,FCfg_FashionDepict_,1,0
 23,FashionPaperCfg,PaperName,FPCfg_PaperName_,1,0
 24,FashionSuitCfg,SuitName,FSCfg_SuitName_,1,0
 25,FightCfg,Desc,FCfg_Desc_,1,0
@@ -89,3 +89,4 @@
 87,RobotCfg,RobotName,RobotCfg_RobotName_,1,0
 88,ExpeditionCfg,Name,ExpeditionCfg_Name_,1,0
 89,ExpeditionCfg,UnlockDesc,ExpeditionCfg_UnlockDesc_,1,0
+90,ActivitiesCfg,Name,ActCfg_Name,1,1

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 112 - 112
Assets/Lua/Config/ActivitiesCfg.lua


+ 1 - 1
Assets/Lua/UI/Common/ChatTextItemCtr.lua

@@ -161,7 +161,7 @@ function ChatTextItemCtr:SetData(wnd, item, logicData, enterType, onClickOwner,
                 end
                 if itemCfgData then
                     local num = (ItemCount and ItemCount > 1) and "x"..logicData.paramIds[3] or ""
-                    item.text.symbolText.text = I18N.SetLanguageValue("ActivityRoulettel", CommonUtil.GetVaildNickName(logicData.nickname), ActivityName ,  I18N.T(itemCfgData.Name))..num
+                    item.text.symbolText.text = I18N.SetLanguageValue("ActivityRoulettel", CommonUtil.GetVaildNickName(logicData.nickname), I18N.T(ActivityName) ,  I18N.T(itemCfgData.Name))..num
                 end
             end
         elseif logicData.type == Enum.ChatSystemType.ActCollection then

Vissa filer visades inte eftersom för många filer har ändrats