diff --git a/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png new file mode 100644 index 0000000000..8d621bd656 Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png differ diff --git a/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png.meta new file mode 100644 index 0000000000..2c88748910 --- /dev/null +++ b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4769ec30d07187a43a0d97ef2012bdc0 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 16e334ed894328241ae810a71def16bb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png new file mode 100644 index 0000000000..67061504b2 Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png differ diff --git a/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png.meta new file mode 100644 index 0000000000..ad204db646 --- /dev/null +++ b/Assets/ManagedResources/Icon/Hero/c_ab_00085_t3.png.meta @@ -0,0 +1,131 @@ +fileFormatVersion: 2 +guid: e6a648631f585e44c9ed0162699dddbf +TextureImporter: + fileIDToRecycleName: + 21300000: c_ab_00085_t3 + 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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: c_ab_00085_t3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 178 + height: 426 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e7f2727ce8852fc4c8a15ea32f90dbc2 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2c79635764f64b2498350c7576ad047f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t1.png.meta index c60cb581cf..317040f603 100644 --- a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t1.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t1.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png index 6d3762a4ab..7b0a85393d 100644 Binary files a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png and b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png differ diff --git a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png.meta index 7bee28fd9d..a88b423a34 100644 --- a/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: 9d08afbb1429f224e970c82ad7d1ac79 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: c_negw_00009_t3 externalObjects: {} serializedVersion: 9 mipmaps: @@ -31,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,9 +70,51 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_negw_00009_t3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 178 + height: 426 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 141ebaa38c94cc84ea5f496212e0ca7a + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t1.png.meta index cba80bc599..72f27c462f 100644 --- a/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t1.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t1.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t3.png.meta index 59f9fa65d2..8d38f33a18 100644 --- a/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t3.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_sjnn_00012_t3.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 33 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta b/Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta index 1c042d0f41..0c061fe856 100644 --- a/Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta +++ b/Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta @@ -49,7 +49,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 7b86e231fb..510c817e67 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -168,9 +168,9 @@ function PlayerLiveView:OnShowLive() self.RideConfig = ConfigManager.GetConfigData(ConfigName.PlayerRole,self.PlayerLiveViewData.ride) local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,self.RideConfig.LiveAnimName) local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale) - local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],curArtResourcesConfig.Position[2],0) + self.RidePosition = Vector3.New(curArtResourcesConfig.Position[1],curArtResourcesConfig.Position[2],0) self.rideLiveStr = curArtResourcesConfig.Name - self.rideLive = poolManager:LoadLive(self.rideLiveStr, self.rideLiveGo.transform, curLocalScale,curLocalPosition) + self.rideLive = poolManager:LoadLive(self.rideLiveStr, self.rideLiveGo.transform, curLocalScale, self.RidePosition) self.rideLivSkeletonGraphic = self.rideLive:GetComponent("SkeletonGraphic") if self.rideLivSkeletonGraphic then self.rideLivSkeletonGraphic.AnimationState:SetAnimation(0, RIDE_WALK_DIR.IDLE_FRONT.animation, true) @@ -233,6 +233,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(1) + self:SetRideOffset(1) elseif dir == WALK_DIR.IDLE_BACK then-- 站立_向后 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -248,6 +249,7 @@ function PlayerLiveView:SetWalkDir(dir) -- 设置层级 self:SetSiblingIndexPlayerOrRide(2) + self:SetRideOffset(2) elseif dir == WALK_DIR.IDLE_LEFT then-- 站立_向左 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -262,6 +264,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(3) + self:SetRideOffset(3) elseif dir == WALK_DIR.IDLE_RIGHT then-- 站立_向右 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -277,6 +280,7 @@ function PlayerLiveView:SetWalkDir(dir) -- 设置层级 self:SetSiblingIndexPlayerOrRide(4) + self:SetRideOffset(4) elseif dir == WALK_DIR.RUN_RIGHT then-- 跑_向右 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -291,6 +295,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(4) + self:SetRideOffset(4) elseif dir == WALK_DIR.RUN_LEFT then-- 跑_向左 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -305,6 +310,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(3) + self:SetRideOffset(3) elseif dir == WALK_DIR.RUN_UP then-- 跑_向上 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -320,6 +326,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(2) + self:SetRideOffset(2) elseif dir == WALK_DIR.RUN_DOWN then-- 跑_向下 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then @@ -334,6 +341,7 @@ function PlayerLiveView:SetWalkDir(dir) end -- 设置层级 self:SetSiblingIndexPlayerOrRide(1) + self:SetRideOffset(1) elseif dir == WALK_DIR.JINGYA then-- 惊讶 if self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 then -- self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_FRONT,RIDE_WALK_DIR.IDLE_FRONT) @@ -398,6 +406,21 @@ function PlayerLiveView:SetSiblingIndexPlayerOrRide(dir) self.playerLiveGo.transform:SetSiblingIndex(3) end end +-- 根据人物方向设置设置坐骑的偏移值 +function PlayerLiveView:SetRideOffset(dir) + if not dir then + return + end + local offset = {0, 0} + -- 有坐骑时 + if self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 + and self.RideConfig and self.RideConfig.RideOffset and self.RideConfig.RideOffset[dir] then + offset = self.RideConfig.RideOffset[dir] + end + if self.RidePosition then + self.rideLive.transform.localPosition = Vector3.New(self.RidePosition.x + offset[1], self.RidePosition.y + offset[2], self.RidePosition.z) + end +end --界面销毁时调用(用于子类重写) function PlayerLiveView:OnClose() if self.rideLive then diff --git a/Assets/Scripts/Editor/OptTools/TextureOptTools.cs b/Assets/Scripts/Editor/OptTools/TextureOptTools.cs index f1ed1b750b..a2a80be79f 100644 --- a/Assets/Scripts/Editor/OptTools/TextureOptTools.cs +++ b/Assets/Scripts/Editor/OptTools/TextureOptTools.cs @@ -559,7 +559,7 @@ namespace LJ_OptTools importerSettings.mipmapEnabled = false; importerSettings.wrapMode = TextureWrapMode.Clamp; importerSettings.filterMode = FilterMode.Trilinear; - importerSettings.alphaIsTransparency = true; + importerSettings.alphaIsTransparency = false; importer.SetTextureSettings(importerSettings); //Android