diff --git a/Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_zh_en.png b/Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_en.png similarity index 100% rename from Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_zh_en.png rename to Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_en.png diff --git a/Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_zh_en.png.meta b/Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_en.png.meta similarity index 100% rename from Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_zh_en.png.meta rename to Assets/ManagedResources/ArtFont_en/s_silingshilian_xmsl_en.png.meta diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 4446a2fb01..e51b66a859 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2716,6 +2716,7 @@ function SetTextVerTial(textCom, vec, alin, posType, nameNum) if GetCurLanguage() == 0 then return end + LogError("dddddddddddddddddddddddddddddddd") local textComp = textCom:GetComponent("Text") textComp.horizontalOverflow = 1 local go = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 2a64123ef6..c8f3c5e6b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -102,7 +102,7 @@ function this:InitComponent() else this.bh.text = "" end - + LogError("ddddddddddd") this.video = Util.GetGameObject(this.gameObject, "VideoPlayer") --用户隐私协议 diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua index 71cfd3fdbb..adf2c9c140 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua @@ -104,7 +104,7 @@ function this.TabBtnOnClick(config, btn) this.selectObj.transform:SetParent(btn.transform) this.selectObj.transform.localScale = Vector3.one this.selectObj.transform.localPosition = Vector3.zero - this.selectTxt.text = config.RankName + this.selectTxt.text = GetLanguageStrById(config.RankName) qaId = config.QAConfig --设置时间 if this.timer then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index b5b9f788ba..c248f7230b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -214,7 +214,7 @@ function RecruitPanelNew:UpdataPanel() self.upper.text = string.format(GetLanguageStrById(self.config.TitleText), PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes), GetLanguageStrById(privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]) .. - " " .. Language[12580] .. num) --特权上限 + " " .. Language[12580] .. num) --特权上限 self:UpdatePanelData() self:TimeCountDown() end @@ -407,7 +407,7 @@ function RecruitPanelNew:UpdatePanelData() Util.AddOnceClick(m.btn, function() if not isFree then if BagManager.GetItemCountById(itemId) < itemNum then - PopupTipPanel.ShowTip(itemConfig[itemId].Name .. Language[10584]) + PopupTipPanel.ShowTip(GetLanguageStrById(itemConfig[itemId].Name) .. Language[10584]) -- local sureFunc=function() -- JumpManager.GoJump(20009) -- end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua index 55af1513a4..404c1eb127 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua @@ -166,7 +166,9 @@ function this.OnShowSingleCardData(go, heroData, index) --isSelect 1选择 2 Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(heroData.isFormation ~= "") Util.GetGameObject(formationMask.transform, "lockImage"):SetActive(heroData.lockState == 1) Util.GetGameObject(go.transform, "noumenon"):SetActive(heroData.id == curHeroData.id) - Util.GetGameObject(go.transform, "name"):GetComponent("Text").text = heroData.heroConfig.ReadingName + Util.GetGameObject(go.transform, "name"):GetComponent("Text").text = SubString2( + GetLanguageStrById(heroData.heroConfig + .ReadingName), 8) local starGrid = Util.GetGameObject(go.transform, "star") local star, starType = heroData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star, starType, nil, nil, Vector2.New(0, 1)) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 3ac5c50345..abf5aca08c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -199,6 +199,7 @@ function this.OnShowSingleCardData(go, heroData) --isSelect 1选择 2 没选择 formationImage:SetActive(heroData.isFormation ~= "") lockImage:SetActive(heroData.lockState == 1) noumenon:SetActive(heroData.id == curHeroData.id) + --LogError(heroData.heroConfig.ReadingName) name.text = SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName), 8) local star, starType = heroData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star, starType, nil, nil, Vector2.New(0, 1)) diff --git a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua index 6ee7f58f84..78b20d8999 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua @@ -180,7 +180,7 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig, heroData) self.pro.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) SetCardStars(self.starGrid, monConfig.Star) self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star]) - self.name.text = heroData.ReadingName + self.name.text = GetLanguageStrById(heroData.ReadingName) end function MonsterCampSingleWave:UpdatePrivilage()