Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
658a655f2c
Binary file not shown.
After Width: | Height: | Size: 74 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fb2366e4636d4d24084aab67ccc1a089
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 02144412ef92f7f4ea9c1c9da4079e1c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -26475,7 +26475,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &369711104
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -26797,7 +26797,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &601964300
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -236946,7 +236946,7 @@ PrefabInstance:
|
|||
- target: {fileID: 7126812816580768065, guid: 9c72861411653334d98f12e4dbdf4ded,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 103
|
||||
value: 203
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9c72861411653334d98f12e4dbdf4ded, type: 3}
|
||||
|
|
|
@ -42,6 +42,10 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
|
|||
local data = nil
|
||||
if skinId and skinId>0 then
|
||||
data = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
|
||||
local roleConfig= ConfigManager.TryGetConfigData(ConfigName.RoleConfig,skinId)
|
||||
if roleConfig then
|
||||
toward=roleConfig.Toward
|
||||
end
|
||||
else
|
||||
data= ConfigManager.GetConfigData(ConfigName.HeroConfig,heroTId)
|
||||
toward=data.Toward
|
||||
|
|
|
@ -123,9 +123,14 @@ function ShengYiTianJiang:OnShowData()
|
|||
self.proPertyText.text = "属性加成:"
|
||||
if not skinConfig then
|
||||
else
|
||||
LogGreen(skinConfig.Live.." name:"..GetResourcePath(skinConfig.Live))
|
||||
LogGreen(skinConfig.Live.." name:"..GetResourcePath(skinConfig.Live))
|
||||
self.LiveObj = poolManager:LoadLive(GetResourcePath(skinConfig.Live),self.liveRoot.transform, Vector3.one * skinConfig.Scale, Vector3.New(skinConfig.Position[1], skinConfig.Position[2], 0))
|
||||
self.skinName.text = ConfigManager.GetConfigData(ConfigName.HeroConfig,skinConfig.HeroId).ReadingName
|
||||
local roleConfig= ConfigManager.TryGetConfigData(ConfigName.RoleConfig,skinId)
|
||||
if roleConfig then
|
||||
|
||||
SetHEeroLiveToward(self.LiveObj,roleConfig.Toward,skinConfig.Position)
|
||||
end
|
||||
local heroSkinSingleProVal = {}
|
||||
for _,v in ipairs(skinConfig.MonomerProperty) do
|
||||
if not heroSkinSingleProVal[v[1]] then
|
||||
|
|
|
@ -151,6 +151,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
live.transform.rotation=Vector3.New(0,0,0)
|
||||
local liveName = GetResourcePath(heroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
|
|
@ -222,6 +222,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
name.text=heroConfig.ReadingName
|
||||
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
live.transform.rotation=Vector3.New(0,0,0)
|
||||
local liveName = GetResourcePath(heroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
@ -229,7 +230,10 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
||||
live.transform.localScale = Vector3.one
|
||||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
LogError("hero toward=="..heroConfig.Toward)
|
||||
if heroConfig.Toward==2 then
|
||||
SetHEeroLiveToward(live,1)
|
||||
end
|
||||
local zs = Util.GetGameObject(o, "zs")
|
||||
local zsName = GetHeroCardStarZs[monsterconfig.Star]
|
||||
if zsName == "" then
|
||||
|
|
|
@ -178,6 +178,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
Util.GetGameObject(o,"hpProgress"):SetActive(false)
|
||||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
live.transform.rotation=Vector3.New(0,0,0)
|
||||
local liveName = GetResourcePath(heroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
|
Loading…
Reference in New Issue