Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
9a687232c9
|
@ -650,6 +650,9 @@ function UIManager.DoLanguageCheck(gameObject)
|
||||||
for i = 0, textArr.Length-1 do
|
for i = 0, textArr.Length-1 do
|
||||||
local textStr=textArr[i].text
|
local textStr=textArr[i].text
|
||||||
textArr[i].text=GetLanguageStrById(textStr)
|
textArr[i].text=GetLanguageStrById(textStr)
|
||||||
|
if GetCurLanguage() == 2 and textArr[i].font and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then
|
||||||
|
textArr[i].font = Util.LoadFont()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
||||||
for i = 0, imageArr.Length-1 do
|
for i = 0, imageArr.Length-1 do
|
||||||
|
|
|
@ -137,6 +137,8 @@ GETALLACTIVITYRESPONSE = protobuf.Descriptor();
|
||||||
GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD = protobuf.FieldDescriptor();
|
GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD = protobuf.FieldDescriptor();
|
||||||
RANDOMNAMERESPONSE = protobuf.Descriptor();
|
RANDOMNAMERESPONSE = protobuf.Descriptor();
|
||||||
RANDOMNAMERESPONSE_RANDOMNAME_FIELD = protobuf.FieldDescriptor();
|
RANDOMNAMERESPONSE_RANDOMNAME_FIELD = protobuf.FieldDescriptor();
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD = protobuf.FieldDescriptor();
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD = protobuf.FieldDescriptor();
|
||||||
RENAMEREQUEST = protobuf.Descriptor();
|
RENAMEREQUEST = protobuf.Descriptor();
|
||||||
RENAMEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
RENAMEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||||
RENAMEREQUEST_NAME_FIELD = protobuf.FieldDescriptor();
|
RENAMEREQUEST_NAME_FIELD = protobuf.FieldDescriptor();
|
||||||
|
@ -1730,11 +1732,31 @@ RANDOMNAMERESPONSE_RANDOMNAME_FIELD.default_value = ""
|
||||||
RANDOMNAMERESPONSE_RANDOMNAME_FIELD.type = 9
|
RANDOMNAMERESPONSE_RANDOMNAME_FIELD.type = 9
|
||||||
RANDOMNAMERESPONSE_RANDOMNAME_FIELD.cpp_type = 9
|
RANDOMNAMERESPONSE_RANDOMNAME_FIELD.cpp_type = 9
|
||||||
|
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.name = "preName"
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.full_name = ".rpc.protocols.RandomNameResponse.preName"
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.number = 2
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.index = 1
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.label = 1
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.has_default_value = false
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.default_value = ""
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.type = 9
|
||||||
|
RANDOMNAMERESPONSE_PRENAME_FIELD.cpp_type = 9
|
||||||
|
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.name = "postName"
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.full_name = ".rpc.protocols.RandomNameResponse.postName"
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.number = 3
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.index = 2
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.label = 1
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.has_default_value = false
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.default_value = ""
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.type = 9
|
||||||
|
RANDOMNAMERESPONSE_POSTNAME_FIELD.cpp_type = 9
|
||||||
|
|
||||||
RANDOMNAMERESPONSE.name = "RandomNameResponse"
|
RANDOMNAMERESPONSE.name = "RandomNameResponse"
|
||||||
RANDOMNAMERESPONSE.full_name = ".rpc.protocols.RandomNameResponse"
|
RANDOMNAMERESPONSE.full_name = ".rpc.protocols.RandomNameResponse"
|
||||||
RANDOMNAMERESPONSE.nested_types = {}
|
RANDOMNAMERESPONSE.nested_types = {}
|
||||||
RANDOMNAMERESPONSE.enum_types = {}
|
RANDOMNAMERESPONSE.enum_types = {}
|
||||||
RANDOMNAMERESPONSE.fields = {RANDOMNAMERESPONSE_RANDOMNAME_FIELD}
|
RANDOMNAMERESPONSE.fields = {RANDOMNAMERESPONSE_RANDOMNAME_FIELD, RANDOMNAMERESPONSE_PRENAME_FIELD, RANDOMNAMERESPONSE_POSTNAME_FIELD}
|
||||||
RANDOMNAMERESPONSE.is_extendable = false
|
RANDOMNAMERESPONSE.is_extendable = false
|
||||||
RANDOMNAMERESPONSE.extensions = {}
|
RANDOMNAMERESPONSE.extensions = {}
|
||||||
RENAMEREQUEST_TYPE_FIELD.name = "type"
|
RENAMEREQUEST_TYPE_FIELD.name = "type"
|
||||||
|
|
|
@ -897,6 +897,7 @@ function this.LoadAsset(path, battleSorting)
|
||||||
end
|
end
|
||||||
--
|
--
|
||||||
local go = poolManager:LoadAsset(path, PoolManager.AssetType.GameObject)
|
local go = poolManager:LoadAsset(path, PoolManager.AssetType.GameObject)
|
||||||
|
UIManager.DoLanguageCheck(go)
|
||||||
local layer = tonumber(go.name) or 0
|
local layer = tonumber(go.name) or 0
|
||||||
battleSorting = battleSorting or BattleManager.GetBattleSorting()
|
battleSorting = battleSorting or BattleManager.GetBattleSorting()
|
||||||
Util.AddParticleSortLayer(go, battleSorting - layer)
|
Util.AddParticleSortLayer(go, battleSorting - layer)
|
||||||
|
|
|
@ -1309,7 +1309,7 @@ function this.GetRandomNameRequest(func)
|
||||||
local msg = PlayerInfoProto_pb.RandomNameResponse()
|
local msg = PlayerInfoProto_pb.RandomNameResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if func then
|
if func then
|
||||||
func(msg.randomName)
|
func(msg.randomName, msg.preName, msg.postName)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -193,7 +193,12 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
||||||
local nameText = Util.GetGameObject(parent, "nameText"):GetComponent("Text")
|
local nameText = Util.GetGameObject(parent, "nameText"):GetComponent("Text")
|
||||||
nameText.text = GetStringByEquipQua(spiritAnimalConfig.Quality, GetLanguageStrById(spiritAnimalConfig.Name))
|
nameText.text = GetStringByEquipQua(spiritAnimalConfig.Quality, GetLanguageStrById(spiritAnimalConfig.Name))
|
||||||
SetTextVerTial(nameText,Vector3.New(55.3,-1.58,0))
|
SetTextVerTial(nameText,Vector3.New(55.3,-1.58,0))
|
||||||
Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065]
|
if GetCurLanguage() == 0 then
|
||||||
|
Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065]
|
||||||
|
else
|
||||||
|
Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = Language[10065] .. curData.lv
|
||||||
|
end
|
||||||
|
-- Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065]
|
||||||
local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")
|
local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")
|
||||||
for key, value in pairs(live2dList) do
|
for key, value in pairs(live2dList) do
|
||||||
if key == liveIndex then
|
if key == liveIndex then
|
||||||
|
|
|
@ -37,9 +37,22 @@ end
|
||||||
|
|
||||||
--得到任意名字数据
|
--得到任意名字数据
|
||||||
function this.GetRandomNameData()
|
function this.GetRandomNameData()
|
||||||
NetManager.GetRandomNameRequest(function(randomName)
|
NetManager.GetRandomNameRequest(function(randomName, preName, postName)
|
||||||
if randomName~="" then
|
if IsLanguagePack then
|
||||||
|
preName = GetLanguageStrById(preName)
|
||||||
|
postName = GetLanguageStrById(postName)
|
||||||
|
if GetCurLanguage() == 1 then
|
||||||
|
randomName = postName .. preName
|
||||||
|
elseif GetCurLanguage() == 2 then
|
||||||
|
randomName = string.gsub(postName, " ", "") -- 使用单独名字去掉中间空格
|
||||||
|
else
|
||||||
|
randomName = preName .. postName
|
||||||
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
|
||||||
|
else
|
||||||
|
if randomName ~= "" then
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -530,7 +530,8 @@ function RoleInfoLayout:DeleteLvUpMaterials(isSingleLvUp,msg)
|
||||||
-- Log("后端更新猎妖师技术前端刷新界面curHeroData.lv "..curHeroData.lv)
|
-- Log("后端更新猎妖师技术前端刷新界面curHeroData.lv "..curHeroData.lv)
|
||||||
end
|
end
|
||||||
-- curHeroData.lv=curHeroData.lv
|
-- curHeroData.lv=curHeroData.lv
|
||||||
PopupTipPanel.ShowTip(Language[12228])
|
-- PopupTipPanel.ShowTip(Language[12228])
|
||||||
|
PopupTipPanel.ShowTip(Language[11867])
|
||||||
end
|
end
|
||||||
-- end
|
-- end
|
||||||
-- end
|
-- end
|
||||||
|
|
Loading…
Reference in New Issue