diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png new file mode 100644 index 0000000000..21ac8a9fbb Binary files /dev/null and b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png differ diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta new file mode 100644 index 0000000000..9028625a61 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 38b276d9f3804ed448fbb95355df1aeb +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bcc7c1f91d93d92418d3e6549178dcf1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FightLevelAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 new file mode 100644 index 0000000000..159dcc3c99 Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 differ diff --git a/Assets/ManagedResources/Audio/BGM/BGM_019.wav.meta b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3.meta similarity index 91% rename from Assets/ManagedResources/Audio/BGM/BGM_019.wav.meta rename to Assets/ManagedResources/Audio/BGM/BGM_019.mp3.meta index 58d763134e..4bca52d1d5 100644 --- a/Assets/ManagedResources/Audio/BGM/BGM_019.wav.meta +++ b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fb00b7acef3636c4cb1c3e34f538c0ce +guid: 3af2491336ce60f499226a93c343ad2c AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/ManagedResources/Audio/BGM/BGM_019.wav b/Assets/ManagedResources/Audio/BGM/BGM_019.wav deleted file mode 100644 index 30eb5ca0f1..0000000000 Binary files a/Assets/ManagedResources/Audio/BGM/BGM_019.wav and /dev/null differ diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index ff6857a12e..4ee02402e4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -34,7 +34,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: 21.9, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 0} m_SizeDelta: {x: 95, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1340578678646069342 @@ -182,13 +182,14 @@ RectTransform: - {fileID: 5594570047289342361} - {fileID: 2491453840571282681} - {fileID: 4794193363044016226} + - {fileID: 7979493423713549204} m_Father: {fileID: 1012972711} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 112, y: 148.66} + m_SizeDelta: {x: 112, y: 168.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &107230299 CanvasRenderer: @@ -5816,7 +5817,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 158, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 @@ -6065,7 +6066,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 300.5, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 @@ -26491,7 +26492,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: 55.2, y: 33.1} + m_AnchoredPosition: {x: 79.74001, y: 33.1} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7450004280634771642 @@ -31624,7 +31625,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -52727,7 +52728,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: 21.9, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2163478246162048306 @@ -58045,7 +58046,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: 21.409988, y: -0.86} + m_AnchoredPosition: {x: 21.409988, y: 17.4} m_SizeDelta: {x: 97.58, y: 97.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &503054044669883281 @@ -58747,7 +58748,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 354, y: 0} m_SizeDelta: {x: 0, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929175774323599367 @@ -60101,7 +60102,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: 22.46, y: -0.3} + m_AnchoredPosition: {x: 47, y: -0.3} m_SizeDelta: {x: 109.23, y: 109.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3747070971011954178 @@ -70743,7 +70744,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: 21.9, y: 0} + m_AnchoredPosition: {x: 46.44001, y: 0} m_SizeDelta: {x: 95, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8840073511339574820 @@ -71146,7 +71147,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: 21.9, y: -69.1} + m_AnchoredPosition: {x: 46.44001, y: -69.1} m_SizeDelta: {x: 126.6, y: 31.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8614474801755879562 @@ -71186,6 +71187,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4758910276381768446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7979493423713549204} + - component: {fileID: 8813203904554842364} + - component: {fileID: 5219945958033942000} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7979493423713549204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4758910276381768446} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 107230295} + m_RootOrder: 3 + 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: 52.9, y: -61.7} + m_SizeDelta: {x: 146, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8813203904554842364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4758910276381768446} + m_CullTransparentMesh: 0 +--- !u!114 &5219945958033942000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4758910276381768446} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 38b276d9f3804ed448fbb95355df1aeb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4820421069940768290 GameObject: m_ObjectHideFlags: 0 @@ -71220,7 +71295,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: 21.9, y: -69.2} + m_AnchoredPosition: {x: 46.44001, y: -69.2} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4820421069940768301 @@ -76934,7 +77009,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: 26.9, y: 0} + m_AnchoredPosition: {x: 52.9, y: 18.259972} m_SizeDelta: {x: 161, y: 148} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5594570047289342367 @@ -97325,7 +97400,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: 83.7, y: 53.2} + m_AnchoredPosition: {x: 52.9, y: 71.45998} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5967992022900652329 @@ -97403,7 +97478,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -98086,7 +98161,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: -12, y: -35.8} + m_AnchoredPosition: {x: 12.540012, y: -35.8} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3138096716679861701