diff --git a/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png b/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png new file mode 100644 index 0000000000..c089aef786 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png.meta new file mode 100644 index 0000000000..fda08c7b0d --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_xinpian_zhuanhuandiban.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 4f7a5439536cd1b43b6e84c32228501d +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: 224, y: 10, z: 224, w: 75} + 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 + - 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: f3e4f53b5c4b99846919f2d1a7f8807d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index d1e03503bf..6e089bb9a5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -50911,7 +50911,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5204423984622933357 Transform: m_ObjectHideFlags: 0 @@ -50920,8 +50920,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 550172830994131731} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} - m_LocalPosition: {x: 3.3, y: -30.35, z: 100.32529} - m_LocalScale: {x: 104.657074, y: 35.799488, z: 0} + m_LocalPosition: {x: -3.77, y: -23.63, z: 100.33} + m_LocalScale: {x: 109.88992, y: 32.07992, z: 0} m_Children: [] m_Father: {fileID: 3829532297210306968} m_RootOrder: 2 @@ -110096,7 +110096,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 315} + m_AnchoredPosition: {x: 13, y: 321.3} m_SizeDelta: {x: 256.32996, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4113268208886061247 @@ -202486,7 +202486,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7237479980650737898} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -219743,7 +219743,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8900822235189486872} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 06b763fac9..dff49269e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -12899,7 +12899,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13184,7 +13184,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: 38, y: 20} + m_AnchoredPosition: {x: 61, y: 20} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3195082168586039975 @@ -14027,7 +14027,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -100, y: -42} + m_AnchoredPosition: {x: -121, y: -85} m_SizeDelta: {x: 446, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &171603213543092075 @@ -14092,17 +14092,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4143441369720722195} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + 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: 7783183355034074848} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 435.08008} - m_SizeDelta: {x: 0, y: 870.1} + m_AnchoredPosition: {x: 0, y: 532} + m_SizeDelta: {x: 0, y: 686.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8199272128087292866 CanvasRenderer: @@ -14132,8 +14132,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bead72cace5c0424385a54673a33a889, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 4f7a5439536cd1b43b6e84c32228501d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15868,7 +15868,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 133, y: -584} + m_AnchoredPosition: {x: 114, y: -559} m_SizeDelta: {x: 152.79999, y: 690.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4325798483183739644 @@ -15891,7 +15891,7 @@ MonoBehaviour: m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 1 - m_CellSize: {x: 160, y: 180} + m_CellSize: {x: 150, y: 180} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 @@ -16612,7 +16612,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 @@ -17327,7 +17327,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -585} + m_AnchoredPosition: {x: -100, y: -563} m_SizeDelta: {x: 152.8, y: 690.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5819746221396831673 @@ -17350,7 +17350,7 @@ MonoBehaviour: m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 1 - m_CellSize: {x: 160, y: 180} + m_CellSize: {x: 150, y: 180} m_Spacing: {x: 0, y: 25} m_Constraint: 1 m_ConstraintCount: 1 @@ -17391,7 +17391,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: -30, y: -7} + m_AnchoredPosition: {x: -30, y: -49} m_SizeDelta: {x: 326, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260218398503831726 diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 99f24bfcdc..fe11439030 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -235,7 +235,7 @@ function QiJieShiLianPanel:SetTabBox() self.ScrollView:SetData(tabList, function (index, go) Util.GetGameObject(go,"Text"):GetComponent("Text").text = tabList[index].Chapter local state = tabList[index].QijieType == self.configData.QijieType - local name = state and "UI_hz_zhonghe01_82" or "UI_hz_zhonghe01_83" + local name = state and "task_bigbtn01" or "task_bigbtn02" Util.GetGameObject(go,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(name) Util.GetGameObject(go,"LockImage"):SetActive(not state) Util.AddOnceClick(go,function ()