Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
ZhangBiao 2021-03-05 15:14:32 +08:00
commit 11ee456279
13 changed files with 93 additions and 52 deletions

View File

@ -31,12 +31,12 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@ -73,12 +73,12 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
@ -95,7 +95,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureFormat: 58
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

View File

@ -20566,7 +20566,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.0000076293945, y: 0.00012207031}
m_SizeDelta: {x: 297.94, y: 135}
m_SizeDelta: {x: 187, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &862902006
CanvasRenderer:
@ -40052,7 +40052,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -79.399994, y: 600}
m_AnchoredPosition: {x: -79.3999, y: 600}
m_SizeDelta: {x: 122, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1490294014

View File

@ -715,8 +715,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 182, y: -37.499985}
m_SizeDelta: {x: 160, y: 50}
m_AnchoredPosition: {x: 147.6, y: -37.499985}
m_SizeDelta: {x: 91, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1140979271
CanvasRenderer:
@ -750,13 +750,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 30
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u79EF\u5206"
@ -813,7 +813,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1591045715
RectTransform:
m_ObjectHideFlags: 0
@ -984,7 +984,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -60, y: -56.6}
m_AnchoredPosition: {x: -60, y: -40.1}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8381992428165824203
@ -2293,7 +2293,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -14, y: -37.499985}
m_SizeDelta: {x: 160, y: 50}
m_SizeDelta: {x: 211.67, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3123008693985460469
CanvasRenderer:
@ -2327,13 +2327,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u73A9\u5BB6\u540D\u5B57\u4E03\u4E2A\u5B57"
@ -2452,7 +2452,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 244, y: -56.000015}
m_AnchoredPosition: {x: 147.1, y: -80.3}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2116139224854375446
@ -2913,7 +2913,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 20, y: -7.100006}
m_AnchoredPosition: {x: 20, y: 7}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3071228195415356122
@ -2993,7 +2993,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 87.100006, y: -56.600006}
m_AnchoredPosition: {x: -59.800056, y: -80.899994}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2277385294711848035
@ -3973,7 +3973,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3405659535368045500
RectTransform:
m_ObjectHideFlags: 0
@ -4704,7 +4704,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 97, y: -56.000015}
m_AnchoredPosition: {x: 147, y: -39.500015}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6848953398962843977
@ -4987,7 +4987,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 66.7, y: 0}
m_AnchoredPosition: {x: 122, y: 0}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6575920878512271627

View File

@ -35,8 +35,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000029250179, y: 0.0000012632372}
m_SizeDelta: {x: 518.98, y: 121.02}
m_AnchoredPosition: {x: 0, y: 0.00000095367}
m_SizeDelta: {x: 297, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222804888083038086
CanvasRenderer:
@ -85,15 +85,15 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 81
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 0
m_LineSpacing: 1
m_Text: "\u6D41\u8840"
LanguageIndex: 0
--- !u!1 &1409698309864438

View File

@ -650,6 +650,9 @@ function UIManager.DoLanguageCheck(gameObject)
for i = 0, textArr.Length-1 do
local textStr=textArr[i].text
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
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
for i = 0, imageArr.Length-1 do

View File

@ -137,6 +137,8 @@ GETALLACTIVITYRESPONSE = protobuf.Descriptor();
GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD = protobuf.FieldDescriptor();
RANDOMNAMERESPONSE = protobuf.Descriptor();
RANDOMNAMERESPONSE_RANDOMNAME_FIELD = protobuf.FieldDescriptor();
RANDOMNAMERESPONSE_PRENAME_FIELD = protobuf.FieldDescriptor();
RANDOMNAMERESPONSE_POSTNAME_FIELD = protobuf.FieldDescriptor();
RENAMEREQUEST = protobuf.Descriptor();
RENAMEREQUEST_TYPE_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.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.full_name = ".rpc.protocols.RandomNameResponse"
RANDOMNAMERESPONSE.nested_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.extensions = {}
RENAMEREQUEST_TYPE_FIELD.name = "type"

View File

@ -665,19 +665,19 @@ function this.WeedCardActivityIsShowRedPoint()
end
--检测战力排行活动红点
function this.WarPowerSortActivityIsShowRedPoint()
local expertRewardTabs = this.GetActivityTypeInfo(ActivityTypeDef.WarPowerReach)
if expertRewardTabs then
for i = 1, #expertRewardTabs.mission do
local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId)
local value = conFigData.Values[1][1]
if expertRewardTabs.mission[i].state == 0 then
if expertRewardTabs.value >= value then
--Log("红点红点 ")
return true
end
end
end
end
-- local expertRewardTabs = this.GetActivityTypeInfo(ActivityTypeDef.WarPowerReach)
-- if expertRewardTabs then
-- for i = 1, #expertRewardTabs.mission do
-- local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId)
-- local value = conFigData.Values[1][1]
-- if expertRewardTabs.mission[i].state == 0 then
-- if expertRewardTabs.value >= value then
-- --Log("红点红点 ")
-- return true
-- end
-- end
-- end
-- end
return false
end
--限时活动里是否有活动开启 > 0 说明有开启的活动

View File

@ -79,9 +79,11 @@ function this.RefreshData(go, itemData)
local redName = Util.GetGameObject(go, "name_2"):GetComponent("Text")
local zhan = Util.GetGameObject(go, "zhan")
local bai = Util.GetGameObject(go, "bai")
Util.GetGameObject(go, "bai"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_bai01_zh")
local shengOrBaiParent1 = Util.GetGameObject(go, "shengOrBaiParent1")
local shengOrBaiParent2 = Util.GetGameObject(go, "shengOrBaiParent2")
local sheng = Util.GetGameObject(go, "sheng")
Util.GetGameObject(go, "sheng"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_shengli02_zh")
local state = Util.GetGameObject(go, "state"):GetComponent("Text")
local betNum = Util.GetGameObject(go, "betNum"):GetComponent("Text")
local getNum = Util.GetGameObject(go, "getNum"):GetComponent("Text")

View File

@ -74,7 +74,7 @@ function this.RefreshData(go, itemData)
--- 基础信息
local head = Util.GetGameObject(go, "head")
local lv_name = Util.GetGameObject(go, "name"):GetComponent("Text")
local power = Util.GetGameObject(go, "power/Text"):GetComponent("Text")
local power = Util.GetGameObject(go, "power"):GetComponent("Text")--/Text
local result = Util.GetGameObject(go, "result"):GetComponent("Text")
local scoreLab = Util.GetGameObject(go, "score"):GetComponent("Text")
local deltaScore = Util.GetGameObject(go, "score/Text"):GetComponent("Text")
@ -95,7 +95,7 @@ function this.RefreshData(go, itemData)
end
lv_name.text = "lv" .. personInfo.level .. " " .. personInfo.name
power.text = personInfo.totalForce
power.text = Language[10104] .. personInfo.totalForce
match.text = ArenaTopMatchManager.GetTurnNameByRoundTimes(itemData.roundTimes)
LogPink("itemData.roundTimes "..itemData.roundTimes.." "..ArenaTopMatchManager.GetTurnNameByRoundTimes(itemData.roundTimes))

View File

@ -897,6 +897,7 @@ function this.LoadAsset(path, battleSorting)
end
--
local go = poolManager:LoadAsset(path, PoolManager.AssetType.GameObject)
UIManager.DoLanguageCheck(go)
local layer = tonumber(go.name) or 0
battleSorting = battleSorting or BattleManager.GetBattleSorting()
Util.AddParticleSortLayer(go, battleSorting - layer)

View File

@ -1309,7 +1309,7 @@ function this.GetRandomNameRequest(func)
local msg = PlayerInfoProto_pb.RandomNameResponse()
msg:ParseFromString(data)
if func then
func(msg.randomName)
func(msg.randomName, msg.preName, msg.postName)
end
end)
end

View File

@ -37,9 +37,22 @@ end
--得到任意名字数据
function this.GetRandomNameData()
NetManager.GetRandomNameRequest(function(randomName)
if randomName~="" then
NetManager.GetRandomNameRequest(function(randomName, preName, postName)
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)
else
if randomName ~= "" then
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
end
end
end)
end