diff --git a/Assets/ResWork/UI_Image/Common/whitebg_del.png b/Assets/ResWork/UI_Image/Common/whitebg_del.png new file mode 100644 index 0000000..9f7469b Binary files /dev/null and b/Assets/ResWork/UI_Image/Common/whitebg_del.png differ diff --git a/Assets/ResWork/UI_Image/Common/whitebg_del.png.meta b/Assets/ResWork/UI_Image/Common/whitebg_del.png.meta new file mode 100644 index 0000000..7a98228 --- /dev/null +++ b/Assets/ResWork/UI_Image/Common/whitebg_del.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 6a7c08a639f8adf47b8fe3bdb91b8ec8 +TextureImporter: + internalIDToNameTable: + - first: + 213: -4831485647292564009 + second: whitebg_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: whitebg_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 10 + height: 10 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7dd7abfe66d13fcb0800000000000000 + internalID: -4831485647292564009 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + whitebg_0: -4831485647292564009 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta index b63b856..b370019 100644 --- a/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta +++ b/Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta @@ -37,7 +37,7 @@ SpriteAtlasImporter: enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 - bindAsDefault: 1 + bindAsDefault: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 42ee5c8..b29c903 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -129,7 +129,7 @@ public class HorseRushPanel : AddrHandleBase void Awake() { STUN_TIME = 0.5f; - RUSH_LIMIT_TIME = 2f; + RUSH_LIMIT_TIME = table_GlobalValue.Ins.Get_Float("MiniGame_MaxRushTime"); BONUS_TIME = 0.4f; FEVER_INCREASE_MIN = 5; FEVER_INCREASE_MAX = 15; @@ -164,7 +164,7 @@ public class HorseRushPanel : AddrHandleBase if (!_isGameStart) return; - _rushTime -= Time.deltaTime; + _rushTime -= Time.deltaTime * table_GlobalValue.Ins.Get_Float("MiniGame_Speed"); _limitTime -= Time.deltaTime; if (_nextTimeUpdate <= 0) @@ -598,7 +598,8 @@ public class HorseRushPanel : AddrHandleBase } else { - _addRushTimeValue = Mathf.Max(0.2f, ((BONUS_TIME * 100f) - Mathf.Round(_totalComboCount / (30f / _totalComboCount * 150f))) / 100f); + _addRushTimeValue = Mathf.Max(table_GlobalValue.Ins.Get_Float("MiniGame_MaxAddTime"), + ((BONUS_TIME * 100f) - Mathf.Round(_totalComboCount / (30f / _totalComboCount * 150f))) / 100f); //Debug.Log($"addRushTimeValue: {_addRushTimeValue}"); } } diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index fb68873..c6df52e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -6610,11 +6610,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 158834835} m_CullTransparentMesh: 1 ---- !u!1 &162700660 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4601400811695666497, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &162805320 GameObject: m_ObjectHideFlags: 0 @@ -29307,11 +29302,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 662707236} m_CullTransparentMesh: 1 ---- !u!1 &667883221 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8131019705385683693, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &671009424 GameObject: m_ObjectHideFlags: 0 @@ -33994,11 +33984,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 793950192} m_CullTransparentMesh: 1 ---- !u!1 &794014990 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7602269929649829496, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &797132673 GameObject: m_ObjectHideFlags: 0 @@ -60490,11 +60475,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322405496} m_CullTransparentMesh: 1 ---- !u!1 &1331928949 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6529096894258932369, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &1333439249 GameObject: m_ObjectHideFlags: 0 @@ -67714,11 +67694,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -42} m_SizeDelta: {x: 0, y: 194} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1528481802 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2658902584104637044, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &1533842731 GameObject: m_ObjectHideFlags: 0 @@ -69470,42 +69445,6 @@ PrefabInstance: propertyPath: m_Name value: HorseRushCanvas objectReference: {fileID: 0} - - target: {fileID: 5974020988588017499, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 519420031} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[0]' - value: - objectReference: {fileID: 3574105333852361132} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[1]' - value: - objectReference: {fileID: 1331928949} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[2]' - value: - objectReference: {fileID: 667883221} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[3]' - value: - objectReference: {fileID: 794014990} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[4]' - value: - objectReference: {fileID: 162700660} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[5]' - value: - objectReference: {fileID: 1652753036} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[6]' - value: - objectReference: {fileID: 1528481802} - - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} - propertyPath: 'gos_sexy.Array.data[7]' - value: - objectReference: {fileID: 1857665096} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -73792,11 +73731,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1652705989} m_CullTransparentMesh: 1 ---- !u!1 &1652753036 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8283837771190577381, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &1653080699 GameObject: m_ObjectHideFlags: 0 @@ -82690,11 +82624,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1857665096 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8874288789284191592, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1 &1860629980 GameObject: m_ObjectHideFlags: 0 @@ -99323,11 +99252,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35b33271aa1bd5e479b44d19341bd5b4, type: 3} ---- !u!1 &3574105333852361132 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3574105332676644573, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} - m_PrefabInstance: {fileID: 4758099844346040569} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4758099844346040569 PrefabInstance: m_ObjectHideFlags: 0