diff --git a/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png b/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png new file mode 100644 index 0000000000..5291a24139 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png differ diff --git a/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png.meta b/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png.meta new file mode 100644 index 0000000000..9acf711902 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1pinzhi/X1_tongyong_beijingtu.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4ff6d307236b9524193e773bc6742d0e +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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dacbd5f04e6acb1458853246d086e311 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/bg/ui/1pinzhi/x1_tongyong_beijingtu + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Icons/r_RareMaterial_Rune_0001.png b/Assets/ManagedResources/Icons/r_RareMaterial_Rune_0001.png index 659d72aa5a..de61a25744 100644 Binary files a/Assets/ManagedResources/Icons/r_RareMaterial_Rune_0001.png and b/Assets/ManagedResources/Icons/r_RareMaterial_Rune_0001.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab index c905dd6a83..9369c71644 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab @@ -211,7 +211,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.20784314, a: 1} + m_Color: {r: 0.9472873, g: 1, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -345,10 +345,10 @@ RectTransform: m_Father: {fileID: 2937637846396242709} m_RootOrder: 0 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: -0.000014544, y: 645.2} - m_SizeDelta: {x: 1080, y: 4.3} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.000014544, y: -576.3} + m_SizeDelta: {x: 1080, y: 4.299988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164265030893954701 CanvasRenderer: @@ -738,7 +738,7 @@ RectTransform: m_GameObject: {fileID: 951425377279466068} 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_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: - {fileID: 6209661766853475157} - {fileID: 1538717577456267531} @@ -748,8 +748,8 @@ 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: 0, y: -492} - m_SizeDelta: {x: 2560, y: 1600} + m_AnchoredPosition: {x: 13, y: 311} + m_SizeDelta: {x: 512, y: 1024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1514387076519238599 CanvasRenderer: @@ -779,7 +779,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: 23b9f27d1bc7aec4eaeb96796b844108, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ff6d307236b9524193e773bc6742d0e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1126,7 +1126,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: -106.70001, y: 254} + m_AnchoredPosition: {x: -106.70001, y: 234} m_SizeDelta: {x: 660.4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3224524120614064272 @@ -1407,6 +1407,7 @@ GameObject: - component: {fileID: 9086765721847696313} - component: {fileID: 3561593802950983661} - component: {fileID: 5812156645698487961} + - component: {fileID: 2974353502207539379} m_Layer: 5 m_Name: infoText (3) m_TagString: Untagged @@ -1454,7 +1455,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.20784314, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1476,6 +1477,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\xB7\u6D3B\u52A8\u671F\u95F4\u5B8C\u6210\u63A2\u7D22\u53EF\u4EE5\u83B7\u53D6\u9053\u5177\u9053\u5177\u9053" LanguageIndex: 10431 +--- !u!114 &2974353502207539379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705957340126524237} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1918016447277630399 GameObject: m_ObjectHideFlags: 0 @@ -1487,6 +1503,7 @@ GameObject: - component: {fileID: 616584768316273317} - component: {fileID: 7905796884641102068} - component: {fileID: 40303447829683880} + - component: {fileID: 6312955416468911749} m_Layer: 5 m_Name: infoText (1) m_TagString: Untagged @@ -1534,7 +1551,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20754719, g: 0.2065682, b: 0.2065682, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1556,6 +1573,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\xB7\u6D3B\u52A8\u671F\u95F4\u5B8C\u6210\u63A2\u7D22\u53EF\u4EE5\u83B7\u53D6\u9053\u5177\u9053\u5177\u9053" LanguageIndex: 10431 +--- !u!114 &6312955416468911749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1918016447277630399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1953365694358536708 GameObject: m_ObjectHideFlags: 0 @@ -1812,14 +1844,14 @@ RectTransform: m_GameObject: {fileID: 2698232983506628919} 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_LocalScale: {x: 1, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 2937637846396242709} m_RootOrder: 1 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: 0, y: 555.7} + m_AnchoredPosition: {x: 0, y: -97.8} m_SizeDelta: {x: 1080, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4633612411572144839 @@ -2140,7 +2172,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3301887, g: 0.3068263, b: 0.3068263, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2173,6 +2205,7 @@ GameObject: - component: {fileID: 4625634190721210904} - component: {fileID: 2582742439194314830} - component: {fileID: 2718747134309756519} + - component: {fileID: 3550080900640307853} m_Layer: 5 m_Name: infoText (2) m_TagString: Untagged @@ -2220,7 +2253,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.20784314, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2242,6 +2275,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\xB7\u6D3B\u52A8\u671F\u95F4\u5B8C\u6210\u63A2\u7D22\u53EF\u4EE5\u83B7\u53D6\u9053\u5177\u9053\u5177\u9053" LanguageIndex: 10431 +--- !u!114 &3550080900640307853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3692990157795466136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3829567482861072029 GameObject: m_ObjectHideFlags: 0 @@ -2702,7 +2750,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: 341.5, y: 199.6} + m_AnchoredPosition: {x: 341.5, y: 235} m_SizeDelta: {x: 236, y: 236} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4813748620982491942 @@ -3293,14 +3341,14 @@ RectTransform: m_GameObject: {fileID: 5789012023822582908} 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_LocalScale: {x: 1, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 2937637846396242709} m_RootOrder: 2 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: 0, y: 327.88715} + m_AnchoredPosition: {x: 0, y: -184.4} m_SizeDelta: {x: 1080, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5887046596240099614 @@ -3483,7 +3531,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: 471a2a0b327152440ab14d6a78e6c81a, type: 3} + m_Sprite: {fileID: 21300000, guid: 06a785d62ded5f74d91632e3c94f4d7e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4340,6 +4388,7 @@ GameObject: - component: {fileID: 5651791219427901304} - component: {fileID: 6587159602084963074} - component: {fileID: 4104155739502469919} + - component: {fileID: 5552000205082453499} m_Layer: 5 m_Name: infoText (4) m_TagString: Untagged @@ -4387,7 +4436,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.20784314, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4409,6 +4458,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\xB7\u6D3B\u52A8\u671F\u95F4\u5B8C\u6210\u63A2\u7D22\u53EF\u4EE5\u83B7\u53D6\u9053\u5177\u9053\u5177\u9053" LanguageIndex: 10431 +--- !u!114 &5552000205082453499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689378526963760788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8941761319558282998 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index 54bf35e47b..af7495f575 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -5948,7 +5948,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: -14, y: 9.7} + m_AnchoredPosition: {x: -14, y: 5.9} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3937756752220422213 @@ -12518,15 +12518,15 @@ RectTransform: m_GameObject: {fileID: 8912294376240615659} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 8.981068} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] m_Father: {fileID: 1454359722381576109} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 66.8501, y: -62.55} - m_SizeDelta: {x: 139.71, y: 131.61} + m_AnchoredPosition: {x: 70.20001, y: -64.6} + m_SizeDelta: {x: 230, y: 219} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7459557167503470699 CanvasRenderer: