diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png new file mode 100644 index 0000000000..c7fcaf07c6 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png differ diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png.meta b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png.meta new file mode 100644 index 0000000000..ff9cf63aea --- /dev/null +++ b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 88de81d49484c654a91775aa875b1f61 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 425c4da269cee8647bbdb2a4b6364ee0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YuJianXingAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png new file mode 100644 index 0000000000..8b21161694 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png differ diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png.meta b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png.meta new file mode 100644 index 0000000000..939acb2dc8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2492e461e749c7347b8d2ffecd0215c0 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8ac28d9dbb932e240841f0095466b5c1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YuJianXingAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png new file mode 100644 index 0000000000..375694d9e0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png differ diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png.meta b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png.meta new file mode 100644 index 0000000000..e5ce227e6d --- /dev/null +++ b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian03.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9319deb2c6b30054b95219af8d3acaa5 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4462d8f81c238ef48ae86bb65499bc9f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YuJianXingAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png new file mode 100644 index 0000000000..510b66ba9e Binary files /dev/null and b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png differ diff --git a/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png.meta b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png.meta new file mode 100644 index 0000000000..3139e09972 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YuJianXingAtlas/y_yujianxing_jian04.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 811b396e013ac844f91d82dd5a847290 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2713e496c9c4c3f46bfa42fe5392dbad + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YuJianXingAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png b/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png new file mode 100644 index 0000000000..970b8292d7 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png differ diff --git a/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png.meta b/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png.meta new file mode 100644 index 0000000000..0b92445011 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/y_yujianxing_yujianxinghuobi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b52ccea4334691a488bee72a7b96ac2f +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e0493d8650c2fce4998731d79ba92c50 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab b/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab index 5dd8c584dd..4d09fea26a 100644 --- a/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/YuJianXing/RiceSinglePlayerView.prefab @@ -451,17 +451,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7048199163809225410} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.27059805, y: 0.27059805, z: -0.6532815, w: 0.6532815} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_Children: [] m_Father: {fileID: 8297825075348053570} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 300, y: 100} + m_SizeDelta: {x: 596, y: 2200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &243184103018672114 CanvasRenderer: @@ -491,7 +491,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 88de81d49484c654a91775aa875b1f61, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -533,6 +533,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 100, y: 200} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua index 86eb521ced..456838c3d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/RiceSinglePlayerView.lua @@ -11,6 +11,7 @@ function RiceSinglePlayerView:New(gameObject) end function RiceSinglePlayerView:InitComponent() + self.spLoader = SpriteLoader.New() self.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(10000,100) self.player = Util.GetGameObject(self.gameObject,"Root") self.playerRoot = Util.GetGameObject(self.gameObject,"Player") @@ -121,6 +122,8 @@ function RiceSinglePlayerView:SetPlayerAndSword() self.liveNode = PlayerLiveView:New(self.playerLiveRoot,1) self.liveNode:OnOpen(25,Vector3.zero,WALK_DIR.IDLE_RIGHT) self.liveNode:SetTitleHide() + + self.swordRoot:GetComponent("Image").sprite = self.spLoader:LoadSprite("y_yujianxing_jian0"..self.index) end --设置单个玩家上下飘动 @@ -131,6 +134,7 @@ end function RiceSinglePlayerView:OnClose() FixedUpdateBeat:Remove(self.OnUpdate, self) + self.spLoader:Destroy() if self.liveNode then self.liveNode:OnClose() self.liveNode = nil diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 3456ab87ac..4803324948 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -94,7 +94,8 @@ function YuJianXingPanel:OnShow() YuJianXingManager.ResetPlayerPosVertical() end self.count = self.count + 1 - end,1,-1):Start() + end,1,-1) + self.timer:Start() end --界面关闭时调用(用于子类重写)