Merge branch 'china/local' into china/test

dev_chengFeng
JieLing 2021-06-08 14:51:19 +08:00
commit 8614a86275
6 changed files with 29 additions and 15 deletions

View File

@ -1 +1 @@
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}}}
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"},"IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}}}

View File

@ -901,11 +901,11 @@ namespace GameLogic
main.startRotationMultiplier *= scale;
}
main.startSpeedMultiplier *= scale;
//particle.transform.localScale *= scale;
particle.transform.localScale *= scale;
}
if (hasParticleObj)
{
//go.transform.localScale = new Vector3(scale, scale, scale);
go.transform.localScale = new Vector3(scale, scale, scale);
}
}

View File

@ -7,8 +7,8 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: chenghao_mat4
m_Shader: {fileID: 4800000, guid: 3e68b57b20d35ac41a6cb8f16e0f5f11, type: 3}
m_Name: chenghao_mat5
m_Shader: {fileID: 4800000, guid: 3a656dd7e5079514386bd3210f3414ce, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -84,14 +84,17 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _Rotator_copy: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _U: 0.2
- _UVSec: 0
- _U_Speed: 0.1
- _U_Speed_copy: -0.5
- _V: 0.7
- _V_Speed: 0.1
- _V_Speed_copy: -0.5
- _ZWrite: 1
m_Colors:

View File

@ -75,9 +75,9 @@ function LingShouBaoGe:BindEvent()
maxRound = 20
}
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function ()
Timer.New(function ()
self:Refresh()
end,3):Start()
-- Timer.New(function ()
-- self:Refresh()
-- end,3):Start()
end)
end)
end

View File

@ -180,7 +180,7 @@ function PlayerLiveView:OnShowLive()
else
effect=self.leader.transform.localScale.x
end
self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale*effect,self.orginLayer)
self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale * effect,self.orginLayer)
end
end
function PlayerLiveView:SetNameHeight(hei)

View File

@ -58,12 +58,12 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer)
if position then
self:SetPostion(position)
end
if scale then
self:SetScale(scale)
end
if effectScale then
self:SetEffectScale(effectScale)
end
if scale then
self:SetScale(scale)
end
if layer then
self:SetLayer(layer)
end
@ -77,15 +77,26 @@ end
function PlayerTitle:SetScale(scale)
self.scale = scale
if self.titleLive then
self.titleLive.transform.localScale = Vector3.one * scale
end
end
function PlayerTitle:SetEffectScale(effectScale)
if isScaleActive then
if self.titleLive then
Util.SetParticleScale(self.titleLive, effectScale)
if self.titleLive then
Util.SetParticleScale(self.titleLive, effectScale)
-- 老包称号显示优化
if not isScaleActive then
local particles = self.titleLive:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
local isScale = false
for key, value in pairs(particles:ToTable()) do
value.transform.localScale = value.transform.localScale / effectScale
isScale = true
end
if isScale then
self.titleLive.transform.localScale = Vector3.one * (self.scale or 1)
end
end
end
end