diff --git a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab index 8d406bf4f..8aa3857d5 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab @@ -152,6 +152,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &523529088316400566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8694505958382383817} + - component: {fileID: 1345017155325040457} + - component: {fileID: 5716579115480276275} + m_Layer: 0 + m_Name: BY_paotai_043 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8694505958382383817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523529088316400566} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -54.5, y: -127.50003} + m_SizeDelta: {x: 149, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1345017155325040457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523529088316400566} + m_CullTransparentMesh: 1 +--- !u!114 &5716579115480276275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523529088316400566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 07b1eb16c7c4bc7419170ea497bffc1d, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &841804620468310696 GameObject: m_ObjectHideFlags: 0 @@ -651,6 +726,141 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1448392809284841101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4233541018414265248} + - component: {fileID: 1813938185056219589} + - component: {fileID: 1354953415460216505} + m_Layer: 0 + m_Name: Text (TMP) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4233541018414265248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448392809284841101} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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.3398, y: -72} + m_SizeDelta: {x: 222.6798, y: 97.6277} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1813938185056219589 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448392809284841101} + m_CullTransparentMesh: 1 +--- !u!114 &1354953415460216505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448392809284841101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1494189083705766291 GameObject: m_ObjectHideFlags: 0 @@ -885,6 +1095,156 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1943314218486924431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7702389681446952042} + - component: {fileID: 7938373861176271041} + - component: {fileID: 6958413085073562465} + m_Layer: 0 + m_Name: BY_paotai_076_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7702389681446952042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943314218486924431} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -2.5, y: -67.5} + m_SizeDelta: {x: 229, y: 89} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7938373861176271041 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943314218486924431} + m_CullTransparentMesh: 1 +--- !u!114 &6958413085073562465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943314218486924431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cfc57c0891db0c94db3cfa564e382b18, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1975289224699682050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6075006626018160182} + - component: {fileID: 4130796838192155251} + - component: {fileID: 125590821414370160} + m_Layer: 0 + m_Name: BY_paotai_016 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6075006626018160182 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975289224699682050} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -72, y: 152} + m_SizeDelta: {x: 90, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4130796838192155251 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975289224699682050} + m_CullTransparentMesh: 1 +--- !u!114 &125590821414370160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975289224699682050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 27c2a28bdddea6f4cab319e8977c8183, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2496060030960750087 GameObject: m_ObjectHideFlags: 0 @@ -1358,6 +1718,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3282580403022943937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7430468890407528571} + - component: {fileID: 4218764663724390610} + - component: {fileID: 101437267389667278} + m_Layer: 0 + m_Name: BY_paotai_011 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7430468890407528571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282580403022943937} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -71.5, y: -2.5} + m_SizeDelta: {x: 91, y: 23} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4218764663724390610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282580403022943937} + m_CullTransparentMesh: 1 +--- !u!114 &101437267389667278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282580403022943937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5c3d7eaf074f5dd4e82be674a6640d33, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3296887005424594569 GameObject: m_ObjectHideFlags: 0 @@ -1511,6 +1946,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3304074617356150524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3081443499380223998} + - component: {fileID: 2965826980400032307} + - component: {fileID: 6995607058854093069} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3081443499380223998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3304074617356150524} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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.3398, y: -199} + m_SizeDelta: {x: 222.6798, y: 97.6277} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2965826980400032307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3304074617356150524} + m_CullTransparentMesh: 1 +--- !u!114 &6995607058854093069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3304074617356150524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3388536674652753574 GameObject: m_ObjectHideFlags: 0 @@ -1661,6 +2231,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3593992711156681296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4611897135764876586} + - component: {fileID: 2868924967060189806} + - component: {fileID: 7645413592506566195} + m_Layer: 0 + m_Name: BY_paotai_074 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4611897135764876586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593992711156681296} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -3, y: -162.5} + m_SizeDelta: {x: 232, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2868924967060189806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593992711156681296} + m_CullTransparentMesh: 1 +--- !u!114 &7645413592506566195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593992711156681296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1896339da90c61c4f8075c63f127a404, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3594963102884290652 GameObject: m_ObjectHideFlags: 0 @@ -1936,6 +2581,81 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &3880690989610794185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 832261531444804339} + - component: {fileID: 8041922002160104829} + - component: {fileID: 1696735714177244868} + m_Layer: 0 + m_Name: BY_paotai_043_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &832261531444804339 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3880690989610794185} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -45.5, y: -0.5000305} + m_SizeDelta: {x: 149, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8041922002160104829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3880690989610794185} + m_CullTransparentMesh: 1 +--- !u!114 &1696735714177244868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3880690989610794185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b0b41bdf46328ff45acfe0b14a61e46d, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3955828112493028847 GameObject: m_ObjectHideFlags: 0 @@ -2798,6 +3518,81 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &5425532027020088811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8310016981244987962} + - component: {fileID: 1562107258119377365} + - component: {fileID: 3933936447333955880} + m_Layer: 0 + m_Name: BY_paotai_043_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8310016981244987962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5425532027020088811} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -54.5, y: 156.5} + m_SizeDelta: {x: 149, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1562107258119377365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5425532027020088811} + m_CullTransparentMesh: 1 +--- !u!114 &3933936447333955880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5425532027020088811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aca4597354c5baa4098d3a6076bc3c4b, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5497252555068226412 GameObject: m_ObjectHideFlags: 0 @@ -3276,6 +4071,8 @@ MonoBehaviour: previewParent: {fileID: 7813380295314095051} tmp_DetailName: {fileID: 3595784137578895197} tmp_DetailDesc: {fileID: 5106596463736225623} + tmp_YouXiaoQi: {fileID: 6995607058854093069} + tmp_TeShuXiaoGuo: {fileID: 1354953415460216505} --- !u!1 &5701770668658621809 GameObject: m_ObjectHideFlags: 0 @@ -4031,6 +4828,81 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6366571374996366664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7820908223577641495} + - component: {fileID: 3118648126257444791} + - component: {fileID: 3943449900955355232} + m_Layer: 0 + m_Name: BY_paotai_076 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7820908223577641495 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6366571374996366664} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -1.5, y: 76.99997} + m_SizeDelta: {x: 229, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3118648126257444791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6366571374996366664} + m_CullTransparentMesh: 1 +--- !u!114 &3943449900955355232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6366571374996366664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 35baf1322cb19bd45b504a8a64fd66b1, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6502438394906593409 GameObject: m_ObjectHideFlags: 0 @@ -4097,7 +4969,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e289c58487160374aa7d2c86002aa09d, type: 3} + m_Sprite: {fileID: 21300000, guid: 79e870810c2078548aaf9968e22f0832, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4794,7 +5666,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d7c6d38dbea9d254fb95c266c19582f2, type: 3} + m_Sprite: {fileID: 21300000, guid: bf29f523458563e4ca7885a9f66b9e0b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5156,6 +6028,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7839578043369376457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4590474591910650028} + - component: {fileID: 6595184631593236801} + - component: {fileID: 5815935454905831361} + m_Layer: 0 + m_Name: BY_paotai_007 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4590474591910650028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7839578043369376457} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9068437723229382290} + 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: -80, y: -127.50003} + m_SizeDelta: {x: 68, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6595184631593236801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7839578043369376457} + m_CullTransparentMesh: 1 +--- !u!114 &5815935454905831361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7839578043369376457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e1b25b6a92a92ca428d344aa254ee9c3, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7879088002463020813 GameObject: m_ObjectHideFlags: 0 @@ -6245,7 +7192,18 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7430468890407528571} + - {fileID: 6075006626018160182} + - {fileID: 4590474591910650028} + - {fileID: 8694505958382383817} + - {fileID: 832261531444804339} + - {fileID: 8310016981244987962} + - {fileID: 7820908223577641495} + - {fileID: 4611897135764876586} + - {fileID: 7702389681446952042} - {fileID: 6699767856386763283} + - {fileID: 4233541018414265248} + - {fileID: 3081443499380223998} m_Father: {fileID: 4670066188549950499} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6268,7 +7226,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8972554169030616421} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -6281,7 +7239,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bb39b9f06bcad864b9a3393c0475384e, type: 3} + m_Sprite: {fileID: 21300000, guid: 79e870810c2078548aaf9968e22f0832, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6491,7 +7449,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 015fa2a7540494a4a8266312a91bd99d, type: 3} + m_Sprite: {fileID: 21300000, guid: 62a9cd565ba6d1f43bdcb888f638bfcb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs index 4fc9a9003..98b95700e 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs @@ -51,6 +51,8 @@ public class UIHome_BY_ItemListPanels : SubUIBase public Transform previewParent; // 预览区容器,选中炮台后在此实例化预制体 public TextMeshProUGUI tmp_DetailName; public TextMeshProUGUI tmp_DetailDesc; + public TextMeshProUGUI tmp_YouXiaoQi; + public TextMeshProUGUI tmp_TeShuXiaoGuo; // ---- 运行时数据 ---- private ItemPanelSelect _currentSelectType = ItemPanelSelect.None; @@ -422,6 +424,15 @@ public class UIHome_BY_ItemListPanels : SubUIBase ? $"编号: {resData.turretNumber}\n类型: {TypeName(resData.turretType)}" : ""; + // 有效期 & 特殊效果 + if (tmp_YouXiaoQi != null) + tmp_YouXiaoQi.text = "永久"; + + if (tmp_TeShuXiaoGuo != null) + tmp_TeShuXiaoGuo.text = resData != null + ? GetSpecialEffectText(resData) + : ""; + // 3. 按钮显隐 & 兑换 UI bool isOwned = turretNumber > 0 && IsItemOwned(turretNumber); RefreshButtonsVisibility(isOwned); @@ -468,6 +479,19 @@ public class UIHome_BY_ItemListPanels : SubUIBase } } + /// 根据道具数据生成特殊效果描述。 + private static string GetSpecialEffectText(TurretResourcesData resData) + { + var parts = new List(); + if (resData.bulletID != null && resData.bulletID.Count > 0) + parts.Add($"子弹: {resData.bulletID.Count}种"); + if (resData.attackAudioID > 0) + parts.Add($"攻击音效: {resData.attackAudioID}"); + if (resData.animationType > 0) + parts.Add($"动画类型: {(resData.animationType == 1 ? "Spine" : resData.animationType == 2 ? "Animator" : "Animation")}"); + return parts.Count > 0 ? string.Join(" | ", parts) : "暂无特殊效果"; + } + // ==================== 获取按钮 ==================== private void OnClickGet() diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs index f6864db59..cafd57dc1 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs @@ -26,7 +26,7 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase int pageNum = 1; float horizontalNormalizedPosition; - private bool _tabsBuilt = false; + private int _lastLeave = -1; public override void Awake() { @@ -59,10 +59,14 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase protected override void OnShow(object args = null) { base.OnShow(args); - if (!_tabsBuilt) + int leave = GetCurrentLeave(); + if (_lastLeave != leave) { + // 场次变了 → 重建分区 Tab + for (int i = tra_DaQuParent.childCount - 1; i >= 0; i--) + Destroy(tra_DaQuParent.GetChild(i).gameObject); BuildFenQuTabs(); - _tabsBuilt = true; + _lastLeave = leave; } } diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab index f0622b0e0..134e01971 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab @@ -2973,6 +2973,162 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1413578699256243531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4218922177022037717} + - component: {fileID: 7189425285968927098} + - component: {fileID: 813914478340190589} + - component: {fileID: 1390476426434184619} + m_Layer: 0 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4218922177022037717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413578699256243531} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3895537558909121795} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7189425285968927098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413578699256243531} + m_CullTransparentMesh: 1 +--- !u!114 &813914478340190589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413578699256243531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u8BF7\u8F93\u5165\u7B7E\u540D" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2150773298 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &1390476426434184619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413578699256243531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1538646608719479632 GameObject: m_ObjectHideFlags: 0 @@ -5947,6 +6103,58 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3097970084482630715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3895537558909121795} + - component: {fileID: 7837993636520020496} + m_Layer: 0 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3895537558909121795 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3097970084482630715} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4218922177022037717} + - {fileID: 7186959717893550242} + m_Father: {fileID: 7498460865793941208} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7837993636520020496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3097970084482630715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} --- !u!1 &3148504686379728616 GameObject: m_ObjectHideFlags: 0 @@ -7717,141 +7925,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 ---- !u!1 &4231798720365677775 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1889295671119270507} - - component: {fileID: 4654856939825290321} - - component: {fileID: 3597376095958225443} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1889295671119270507 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4231798720365677775} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8615869927594018281} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 158.17242, y: 0} - m_SizeDelta: {x: 207.655, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4654856939825290321 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4231798720365677775} - m_CullTransparentMesh: 1 ---- !u!114 &3597376095958225443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4231798720365677775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u6211\u6BD4\u8F83\u61D2\uFF0C\u4EC0\u4E48\u90FD\u6CA1\u5199" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} - m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4285357662 - m_fontColor: {r: 0.36862746, g: 0.36862746, b: 0.427451, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 19.8 - m_fontSizeBase: 19.8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4232538350810047032 GameObject: m_ObjectHideFlags: 0 @@ -10766,6 +10839,181 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &5554308849036475339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7498460865793941208} + - component: {fileID: 2331807722807801831} + - component: {fileID: 7886715884165143335} + - component: {fileID: 7058191744341110696} + m_Layer: 0 + m_Name: InputField (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7498460865793941208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5554308849036475339} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3895537558909121795} + m_Father: {fileID: 8615869927594018281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 158.17236, y: 0} + m_SizeDelta: {x: 207.655, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2331807722807801831 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5554308849036475339} + m_CullTransparentMesh: 1 +--- !u!114 &7886715884165143335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5554308849036475339} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7058191744341110696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5554308849036475339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7886715884165143335} + m_TextViewport: {fileID: 3895537558909121795} + m_TextComponent: {fileID: 4017868745185227564} + m_Placeholder: {fileID: 813914478340190589} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} --- !u!1 &5591369288884661773 GameObject: m_ObjectHideFlags: 0 @@ -12182,7 +12430,7 @@ MonoBehaviour: tMPText_Name: {fileID: 102329551224647658} tMPText_ID: {fileID: 7215819849252547559} tMPText_UserNumber: {fileID: 6000250217060215839} - tMPText_LabelQM: {fileID: 3597376095958225443} + tMPText_LabelQM: {fileID: 4017868745185227564} tMPText_IP: {fileID: 8286863895223483902} tMPText_VIPLeave: {fileID: 4098653053053118094} tMPText_PhoneNumber: {fileID: 7174896096397030657} @@ -12192,6 +12440,8 @@ MonoBehaviour: tMPText_YZM: {fileID: 7082954204560661599} btn_GetYZM: {fileID: 4496705652242990577} btn_ChangePhoneNumber: {fileID: 7267491945513784084} + tMPText_GeXingQianName: {fileID: 7058191744341110696} + btn_Change: {fileID: 3852625459627003929} tMPText_NewName: {fileID: 4191942530184419657} btn_ChangeName: {fileID: 8919983291277467953} tMPText_PhoneNumberXGMM: {fileID: 2681194560352116732} @@ -13155,7 +13405,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1889295671119270507} + - {fileID: 7498460865793941208} - {fileID: 9042852771848408807} m_Father: {fileID: 4070896026580936839} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14757,6 +15007,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7861477998426107709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7186959717893550242} + - component: {fileID: 2957360901614419785} + - component: {fileID: 4017868745185227564} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7186959717893550242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861477998426107709} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3895537558909121795} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0.5} + m_SizeDelta: {x: 20, y: 13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2957360901614419785 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861477998426107709} + m_CullTransparentMesh: 1 +--- !u!114 &4017868745185227564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861477998426107709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4285357662 + m_fontColor: {r: 0.36862746, g: 0.36862746, b: 0.427451, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 19.8 + m_fontSizeBase: 19.8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7926507599718907521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs index 0b2ff5ed9..4100f254b 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs @@ -19,7 +19,6 @@ public class UserInfoPanel : SubUIBase public TextMeshProUGUI tMPText_Name; public TextMeshProUGUI tMPText_ID; public TextMeshProUGUI tMPText_UserNumber; - public TextMeshProUGUI tMPText_LabelQM; public TextMeshProUGUI tMPText_IP; public TextMeshProUGUI tMPText_VIPLeave; public TextMeshProUGUI tMPText_PhoneNumber; @@ -30,6 +29,9 @@ public class UserInfoPanel : SubUIBase public TMP_InputField tMPText_YZM; public Button btn_GetYZM; //先不写获取验证码 public Button btn_ChangePhoneNumber; + [Header("改个性签名")] + public TMP_InputField tMPText_GeXingQianName; + public Button btn_Change; [Header("改名")] public TMP_InputField tMPText_NewName; public Button btn_ChangeName; @@ -74,6 +76,9 @@ public class UserInfoPanel : SubUIBase btn_ChangeName.onClick.AddListener(OnClickChangeName); // 修改密码 btn_ChangePassword.onClick.AddListener(OnClickChangePassword); + + // 改个性签名 + btn_Change.onClick.AddListener(OnClickSaveSignature); } protected override void OnShow(object args = null) @@ -115,7 +120,10 @@ public class UserInfoPanel : SubUIBase tMPText_Name.text = gameManager.user.BaseInfo.userName; tMPText_ID.text = gameManager.user.BaseInfo.number; tMPText_UserNumber.text = gameManager.user.BaseInfo.mobile; - tMPText_LabelQM.text = PlayerPrefs.GetString("QM", "我比较懒,什么都没写"); + + // 个性签名输入框 + if (tMPText_GeXingQianName != null) + tMPText_GeXingQianName.text = PlayerPrefs.GetString("QM", "我比较懒,什么都没写"); tMPText_IP.text = gameManager.user.@static.lastLoginIp; tMPText_VIPLeave.text = gameManager.user.assets.vipLevel.ToString(); tMPText_PhoneNumber.text = MaskPhone(gameManager.user.BaseInfo.mobile); @@ -471,6 +479,22 @@ public class UserInfoPanel : SubUIBase }); } + // ==================== 改个性签名 ==================== + + private void OnClickSaveSignature() + { + if (tMPText_GeXingQianName == null) return; + string text = tMPText_GeXingQianName.text.Trim(); + if (string.IsNullOrEmpty(text)) + { + UIManager.Instance.ShowBoardError("签名不能为空"); + return; + } + PlayerPrefs.SetString("QM", text); + PlayerPrefs.Save(); + UIManager.Instance.ShowBoardError("签名保存成功"); + } + // ==================== 工具 ==================== public static string MaskPhone(string phone) diff --git a/Assets/UIResources/Home/炮台.psb b/Assets/UIResources/Home/炮台.psb index 410e38a02..8bd9528f1 100644 Binary files a/Assets/UIResources/Home/炮台.psb and b/Assets/UIResources/Home/炮台.psb differ diff --git a/Assets/UIResources/Home/炮台.psb.meta b/Assets/UIResources/Home/炮台.psb.meta index 2bf7e5df8..4e0feddee 100644 --- a/Assets/UIResources/Home/炮台.psb.meta +++ b/Assets/UIResources/Home/炮台.psb.meta @@ -94,7 +94,7 @@ ScriptedImporter: spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - - name: "\u51FA\u6218" + - name: "\u6FC0\u6D3B" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -102,10 +102,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 89 - width: 92 - height: 49 - spriteID: 33713dde57f3190448f93507c788e4f2 + y: 1981 + width: 96 + height: 48 + spriteID: 02ad3015bd885b648a256bf974ae3712 spriteBone: [] spriteOutline: [] vertices: [] @@ -113,7 +113,133 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 89} + uvTransform: {x: 4, y: 1981} + spritePosition: {x: 924, y: 43} + - name: godking_main_suipian_diaocan + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 762 + y: 828 + width: 98 + height: 102 + spriteID: 12e7804b8e2fd3f479b7243c6d164a05 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 762, y: 828} + spritePosition: {x: 589, y: 23} + - name: 0/100 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 204 + width: 93 + height: 30 + spriteID: 306847fef41ef5e4c94388cfde6edfd3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 204} + spritePosition: {x: 722, y: 37} + - name: activity_monthgift_btn_left01 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1436 + width: 208 + height: 81 + spriteID: e30d98582d9e0154fb218ff93e3ce28d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1436} + spritePosition: {x: 867, y: 27} + - name: godking_main_suipian_bar01 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 255 + y: 2022 + width: 24 + height: 15 + spriteID: 2723e2fae83cad440b45b31e74d4fac4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 255, y: 2022} + spritePosition: {x: 696, y: 72} + - name: godking_main_suipianl_bottom + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1364 + width: 272 + height: 64 + spriteID: c18429a2e928f844abce25b20a4d309d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1364} + spritePosition: {x: 638, y: 34} + - name: "\u51FA\u6218" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 89 + width: 92 + height: 49 + spriteID: 68b15fb66bed65b4e9468da006fa3b59 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 89} spritePosition: {x: 760, y: 40} - name: LCSGSL_btn01 originalName: @@ -123,10 +249,1018 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 4 + y: 1279 width: 227 height: 77 - spriteID: ea92a9f2b4ada7449955be8460b32c80 + spriteID: 17ba0418ca0bfbe4e897e7cb2d8a98ad + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1279} + spritePosition: {x: 688, y: 25} + - name: "\u6218\u795E" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1399 + y: 828 + width: 58 + height: 32 + spriteID: 20af4a742c8bc2649b08323bdb273b29 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1399, y: 828} + spritePosition: {x: 366, y: 688} + - name: "\u7FC5\u8180" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1265 + y: 828 + width: 59 + height: 32 + spriteID: 1f187b2e0fda54e4fb138c097033fdfd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1265, y: 828} + spritePosition: {x: 229, y: 688} + - name: "\u70AE\u53F0" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 220 + y: 1436 + width: 59 + height: 33 + spriteID: 675ba51e1260fb44eb6189828e4caca2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 220, y: 1436} + spritePosition: {x: 93, y: 688} + - name: "\u5DF2\u8FC7\u671F" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 189 + y: 2022 + width: 58 + height: 20 + spriteID: 5442c1fa7ac73ef41a6a07e417ee46e7 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 189, y: 2022} + spritePosition: {x: 133, y: 452} + - name: "\u672A\u62E5\u6709" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 122 + y: 2022 + width: 59 + height: 20 + spriteID: 121ff2c5d67976541a1ab445e1d9d5b4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 122, y: 2022} + spritePosition: {x: 133, y: 487} + - name: "\u5DF2\u62E5\u6709" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1607 + y: 828 + width: 58 + height: 20 + spriteID: 6c5ff1d603696184289914320a87c159 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1607, y: 828} + spritePosition: {x: 135, y: 519} + - name: "\u5168\u90E8" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 239 + y: 1333 + width: 39 + height: 20 + spriteID: df6824cd770255a4088de04069d4d28f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 239, y: 1333} + spritePosition: {x: 141, y: 555} + - name: "\u5168\u90E8" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 241 + y: 1182 + width: 39 + height: 20 + spriteID: 5836d6698b563804cac2fb63a13ce2ac + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 241, y: 1182} + spritePosition: {x: 145, y: 599} + - name: BY_paotai_069 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1636 + y: 534 + width: 149 + height: 179 + spriteID: 89412f02917cbde4d923d76ad56042af + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1636, y: 534} + spritePosition: {x: 85, y: 418} + - name: BY_paotai_042 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 241 + y: 1210 + width: 22 + height: 16 + spriteID: 56c351fc14357584db49cce915aa886a + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 241, y: 1210} + spritePosition: {x: 212, y: 598} + - name: BY_paotai_026 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1808 + width: 256 + height: 49 + spriteID: 6679f0e960db73d4794396b2396512ee + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1808} + spritePosition: {x: 40, y: 587} + - name: "\u56FE\u5C42 2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 166 + y: 1716 + width: 86 + height: 79 + spriteID: a68e018eebed97a49affeb9350ae60ff + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 166, y: 1716} + spritePosition: {x: 987, y: 221} + - name: "\u56FE\u5C42 4" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 4 + width: 87 + height: 77 + spriteID: 070132e1010228942aaa2213bc68f944 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 4} + spritePosition: {x: 546, y: 222} + - name: "\u56FE\u5C42 10" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1658 + width: 260 + height: 50 + spriteID: 8851b426a02f7fb41ad6abc14dfc4477 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1658} + spritePosition: {x: 1290, y: 589} + - name: "\u7EC4 1" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1716 + width: 154 + height: 84 + spriteID: 2490cc9ddbab8ea4baf9c5dcf2d5fcdf + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1716} + spritePosition: {x: 43, y: 650} + - name: "\u70AE\u53F0" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 220 + y: 1477 + width: 59 + height: 33 + spriteID: 3e77d95ab3c85b34ea5fd14d446bf9fd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 220, y: 1477} + spritePosition: {x: 92, y: 688} + - name: "\u6218\u795E" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1465 + y: 828 + width: 58 + height: 32 + spriteID: b193d53ce8a80484da03867971e64a5e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1465, y: 828} + spritePosition: {x: 366, y: 688} + - name: "\u7FC5\u8180" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1332 + y: 828 + width: 59 + height: 32 + spriteID: ab510bc0ffc543540b2b754d3cab7421 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1332, y: 828} + spritePosition: {x: 229, y: 688} + - name: "\u7EC4 3 \u62F7\u8D1D 4" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 239 + y: 1279 + width: 42 + height: 46 + spriteID: cea8b0b7605c0c54ab3d426485b09cdd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 239, y: 1279} + spritePosition: {x: 93, y: 144} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D 4" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 133 + y: 1525 + width: 110 + height: 108 + spriteID: 368e6355b7e2fc943849713ca976bb12 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 133, y: 1525} + spritePosition: {x: 57, y: 110} + - name: "\u7EC4 3 \u62F7\u8D1D 4" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 240 + y: 1865 + width: 42 + height: 46 + spriteID: 89eab67082379ac488bc325e0a5f4161 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 240, y: 1865} + spritePosition: {x: 204, y: 144} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D 4" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1865 + width: 110 + height: 108 + spriteID: df2b0c986a3922149a52e89fc789c95b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1865} + spritePosition: {x: 168, y: 110} + - name: "\u7EC4 3 \u62F7\u8D1D 3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 240 + y: 1919 + width: 42 + height: 46 + spriteID: 6f4472be7f27b574d97767b7b6657081 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 240, y: 1919} + spritePosition: {x: 93, y: 253} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D 3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 122 + y: 1865 + width: 110 + height: 108 + spriteID: 6d54c7cb6967de140bbdcd184c58a85a + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 122, y: 1865} + spritePosition: {x: 57, y: 219} + - name: "\u7EC4 3 \u62F7\u8D1D 3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 305 + width: 42 + height: 46 + spriteID: 55155434b9da2784382cbd20ecd3cf7d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 305} + spritePosition: {x: 204, y: 253} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D 3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 290 + y: 828 + width: 110 + height: 108 + spriteID: 502abd0f6f127f843b335890fdff7490 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 290, y: 828} + spritePosition: {x: 168, y: 219} + - name: "\u7EC4 3 \u62F7\u8D1D 2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 359 + width: 42 + height: 46 + spriteID: f8b4e648d9f61cc45b42e258971e8ce1 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 359} + spritePosition: {x: 93, y: 362} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D 2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 408 + y: 828 + width: 110 + height: 108 + spriteID: 431e0bbb51285a843b27f33fd5bc23ad + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 408, y: 828} + spritePosition: {x: 57, y: 328} + - name: "\u7EC4 3 \u62F7\u8D1D" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 413 + width: 42 + height: 46 + spriteID: ff4eb9f3f691919438071589a90ab727 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 413} + spritePosition: {x: 204, y: 362} + - name: "\u56FE\u5C42 17 \u62F7\u8D1D" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 526 + y: 828 + width: 110 + height: 108 + spriteID: 6b81bd27409ad054696e3d2b14198474 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 526, y: 828} + spritePosition: {x: 168, y: 328} + - name: "\u7EC4 3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 467 + width: 42 + height: 46 + spriteID: 0cf8ba4d4877ccd4abe5930b62435464 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 467} + spritePosition: {x: 204, y: 471} + - name: "\u56FE\u5C42 17" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 644 + y: 828 + width: 110 + height: 108 + spriteID: 3594bd0d97516f14988f8a90c0f84a1b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 644, y: 828} + spritePosition: {x: 168, y: 437} + - name: "\u56FE\u5C42 16" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1525 + width: 121 + height: 125 + spriteID: 3bb1179db97b89d4d9e43facfee6d983 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1525} + spritePosition: {x: 54, y: 433} + - name: "\u7EC4 1" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 290 + y: 762 + width: 436 + height: 58 + spriteID: 56d123866d1590646911c3d5d7c5c842 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 290, y: 762} + spritePosition: {x: 40, y: 676} + - name: "\u7EC4 2" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1636 + y: 4 + width: 305 + height: 522 + spriteID: 49046f21b4b70f0459c8ff99b896ff06 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1636, y: 4} + spritePosition: {x: 13, y: 67} + - name: "\u56FE\u5C42 9" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 146 + width: 67 + height: 50 + spriteID: 3ce14310c0a61e74ca427751d18ebd00 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 146} + spritePosition: {x: 1483, y: 684} + - name: "\u83B7\u53D6" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1793 + y: 534 + width: 221 + height: 107 + spriteID: bd14b2642a2c63e4c8dbe167d75a4ee6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1793, y: 534} + spritePosition: {x: 685, y: 27} + - name: BY_paotai_011 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 274 + width: 91 + height: 23 + spriteID: 5e1c945acb8744a4898f29889501c195 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 274} + spritePosition: {x: 1304, y: 366} + - name: BY_paotai_016 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1949 + y: 242 + width: 90 + height: 24 + spriteID: 6105878f7e0076747ab5694f326984c9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1949, y: 242} + spritePosition: {x: 1304, y: 520} + - name: BY_paotai_007 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1531 + y: 828 + width: 68 + height: 25 + spriteID: c9b8a995d7817824483d28627fd4ec64 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1531, y: 828} + spritePosition: {x: 1307, y: 240} + - name: BY_paotai_043 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1636 + y: 721 + width: 149 + height: 33 + spriteID: ee40901f29eefe344b42a83a5ac4f52b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1636, y: 721} + spritePosition: {x: 1292, y: 236} + - name: BY_paotai_043 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 122 + y: 1981 + width: 149 + height: 33 + spriteID: a63f3dd1191a90a43bb3de4b9fc1cce2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 122, y: 1981} + spritePosition: {x: 1301, y: 363} + - name: BY_paotai_043 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1108 + y: 828 + width: 149 + height: 33 + spriteID: 18e83b50ade58ea44a860095cd5cfccd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1108, y: 828} + spritePosition: {x: 1292, y: 520} + - name: BY_paotai_076 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1793 + y: 649 + width: 229 + height: 98 + spriteID: d7e496c10305367449a2473bfcd51eac + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1793, y: 649} + spritePosition: {x: 1305, y: 408} + - name: BY_paotai_074 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 868 + y: 828 + width: 232 + height: 37 + spriteID: cfef68de0bd270e4dbc885b9c2ee930c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 868, y: 828} + spritePosition: {x: 1302, y: 199} + - name: BY_paotai_076 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1182 + width: 229 + height: 89 + spriteID: ccdcd3e0a9dcb394cadadc562bc7afb5 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1182} + spritePosition: {x: 1304, y: 268} + - name: BY_paotai_053 + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 762 + width: 278 + height: 412 + spriteID: 391565b1b3f4a6040b4ebc9c8d22171f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 762} + spritePosition: {x: 1282, y: 168} + - name: "\u56FE\u5C42 1" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 1624 + height: 750 + spriteID: 7fad730d38016c249af7d471aceff05d spriteBone: [] spriteOutline: [] vertices: [] @@ -135,7 +1269,7 @@ ScriptedImporter: edges: [] tessellationDetail: 0 uvTransform: {x: 4, y: 4} - spritePosition: {x: 688, y: 25} + spritePosition: {x: 0, y: 0} characterData: bones: [] parts: [] @@ -212,79 +1346,79 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: -1 - spriteID: a63da1f4e95810b488d4f9f0a87076bd + spriteID: 164f37e8245f7d94bbb1cf443edfe3b9 layerID: 171 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 + isVisible: 1 - name: "\u6FC0\u6D3B" spriteName: "\u6FC0\u6D3B" isGroup: 0 parentIndex: 0 - spriteID: 0ee03999dc82d69439b633e4673e524d + spriteID: 02ad3015bd885b648a256bf974ae3712 layerID: 170 - mosaicPosition: {x: 326, y: 76} + mosaicPosition: {x: 4, y: 1981} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: godking_main_suipian_diaocan spriteName: godking_main_suipian_diaocan isGroup: 0 parentIndex: 0 - spriteID: 71d3b3f89c0bae240a0041ddcd065248 + spriteID: 12e7804b8e2fd3f479b7243c6d164a05 layerID: 164 - mosaicPosition: {x: 220, y: 76} + mosaicPosition: {x: 762, y: 828} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: 0/100 spriteName: 0/100 isGroup: 0 parentIndex: 0 - spriteID: c7972dfaa5f421b4889d4ffb2b0ae318 + spriteID: 306847fef41ef5e4c94388cfde6edfd3 layerID: 165 - mosaicPosition: {x: 326, y: 132} + mosaicPosition: {x: 1949, y: 204} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: activity_monthgift_btn_left01 spriteName: activity_monthgift_btn_left01 isGroup: 0 parentIndex: 0 - spriteID: de5ad155a31f0344799e31ee41bb3faa + spriteID: e30d98582d9e0154fb218ff93e3ce28d layerID: 169 - mosaicPosition: {x: 4, y: 76} + mosaicPosition: {x: 4, y: 1436} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: godking_main_suipian_bar01 spriteName: godking_main_suipian_bar01 isGroup: 0 parentIndex: 0 - spriteID: 57c63991e292d014ca5e8ed5576ede65 + spriteID: 2723e2fae83cad440b45b31e74d4fac4 layerID: 168 - mosaicPosition: {x: 430, y: 76} + mosaicPosition: {x: 255, y: 2022} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: godking_main_suipianl_bottom spriteName: godking_main_suipianl_bottom isGroup: 0 parentIndex: 0 - spriteID: 80dd890608694b744b398375986c4e74 + spriteID: c18429a2e928f844abce25b20a4d309d layerID: 167 - mosaicPosition: {x: 4, y: 4} + mosaicPosition: {x: 4, y: 1364} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u51FA\u6218" spriteName: "\u51FA\u6218" isGroup: 0 parentIndex: -1 - spriteID: 33713dde57f3190448f93507c788e4f2 + spriteID: 68b15fb66bed65b4e9468da006fa3b59 layerID: 174 - mosaicPosition: {x: 4, y: 89} + mosaicPosition: {x: 1949, y: 89} flatten: 0 isImported: 1 isVisible: 1 @@ -292,9 +1426,9 @@ ScriptedImporter: spriteName: LCSGSL_btn01 isGroup: 0 parentIndex: -1 - spriteID: ea92a9f2b4ada7449955be8460b32c80 + spriteID: 17ba0418ca0bfbe4e897e7cb2d8a98ad layerID: 173 - mosaicPosition: {x: 4, y: 4} + mosaicPosition: {x: 4, y: 1279} flatten: 0 isImported: 1 isVisible: 1 @@ -302,374 +1436,536 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: -1 - spriteID: dce5a34b1c42193418af6e523b567d91 + spriteID: 36379db6158d08e4f89a9a675b54fb0b layerID: 132 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 - - name: "\u6218\u795E" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: dfd5de93d1ef66e4e87829729890d6bd - layerID: 135 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: "\u7FC5\u8180" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 696a002e9677111478b7a4f5ee232eec - layerID: 134 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: "\u70AE\u53F0" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: a6b2f280f9ec80a4aa0d41199abc820a - layerID: 125 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 isVisible: 1 - - name: "\u56FE\u5C42 14" - spriteName: + - name: "\u6218\u795E" + spriteName: "\u6218\u795E" + isGroup: 0 + parentIndex: 9 + spriteID: 20af4a742c8bc2649b08323bdb273b29 + layerID: 135 + mosaicPosition: {x: 1399, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u7FC5\u8180" + spriteName: "\u7FC5\u8180" + isGroup: 0 + parentIndex: 9 + spriteID: 1f187b2e0fda54e4fb138c097033fdfd + layerID: 134 + mosaicPosition: {x: 1265, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u70AE\u53F0" + spriteName: "\u70AE\u53F0" + isGroup: 0 + parentIndex: 9 + spriteID: 675ba51e1260fb44eb6189828e4caca2 + layerID: 125 + mosaicPosition: {x: 220, y: 1436} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5DF2\u8FC7\u671F" + spriteName: "\u5DF2\u8FC7\u671F" isGroup: 0 parentIndex: -1 - spriteID: 046298555c79ecb47a9d3516dcf822ec - layerID: 31 - mosaicPosition: {x: 0, y: 0} + spriteID: 5442c1fa7ac73ef41a6a07e417ee46e7 + layerID: 222 + mosaicPosition: {x: 189, y: 2022} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 + - name: "\u672A\u62E5\u6709" + spriteName: "\u672A\u62E5\u6709" + isGroup: 0 + parentIndex: -1 + spriteID: 121ff2c5d67976541a1ab445e1d9d5b4 + layerID: 221 + mosaicPosition: {x: 122, y: 2022} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5DF2\u62E5\u6709" + spriteName: "\u5DF2\u62E5\u6709" + isGroup: 0 + parentIndex: -1 + spriteID: 6c5ff1d603696184289914320a87c159 + layerID: 220 + mosaicPosition: {x: 1607, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5168\u90E8" + spriteName: "\u5168\u90E8" + isGroup: 0 + parentIndex: -1 + spriteID: df6824cd770255a4088de04069d4d28f + layerID: 219 + mosaicPosition: {x: 239, y: 1333} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5168\u90E8" + spriteName: "\u5168\u90E8" + isGroup: 0 + parentIndex: -1 + spriteID: 5836d6698b563804cac2fb63a13ce2ac + layerID: 223 + mosaicPosition: {x: 241, y: 1182} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_069 + spriteName: BY_paotai_069 + isGroup: 0 + parentIndex: -1 + spriteID: 89412f02917cbde4d923d76ad56042af + layerID: 218 + mosaicPosition: {x: 1636, y: 534} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_042 + spriteName: BY_paotai_042 + isGroup: 0 + parentIndex: -1 + spriteID: 56c351fc14357584db49cce915aa886a + layerID: 217 + mosaicPosition: {x: 241, y: 1210} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_026 + spriteName: BY_paotai_026 + isGroup: 0 + parentIndex: -1 + spriteID: 6679f0e960db73d4794396b2396512ee + layerID: 216 + mosaicPosition: {x: 4, y: 1808} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u56FE\u5C42 2" - spriteName: + spriteName: "\u56FE\u5C42 2" isGroup: 0 parentIndex: -1 - spriteID: 0f56dec2cc7505048a949ee09bd7c051 + spriteID: a68e018eebed97a49affeb9350ae60ff layerID: 7 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 166, y: 1716} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u56FE\u5C42 4" - spriteName: + spriteName: "\u56FE\u5C42 4" isGroup: 0 parentIndex: -1 - spriteID: 02e09c1e6b4c0ed45a65f792b1ca1746 + spriteID: 070132e1010228942aaa2213bc68f944 layerID: 10 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 4} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u56FE\u5C42 10" - spriteName: + spriteName: "\u56FE\u5C42 10" isGroup: 0 parentIndex: -1 - spriteID: 17aedf8371c1606439a5c6e9982d5ca5 + spriteID: 8851b426a02f7fb41ad6abc14dfc4477 layerID: 25 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 4, y: 1658} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u7EC4 1" - spriteName: + spriteName: "\u7EC4 1" isGroup: 0 parentIndex: -1 - spriteID: cb5aa769aa3493e439668774caff2e5f + spriteID: 2490cc9ddbab8ea4baf9c5dcf2d5fcdf layerID: 114 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 4, y: 1716} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u7EC4 6" spriteName: isGroup: 1 parentIndex: -1 - spriteID: 876c401c909188344837fd27dd966dee + spriteID: 194e6f67bee99f94592aadbd133e287e layerID: 123 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 + isVisible: 1 - name: "\u70AE\u53F0" - spriteName: + spriteName: "\u70AE\u53F0" isGroup: 0 - parentIndex: 18 - spriteID: d208859e8ad6cd243b4f98751c8353ba + parentIndex: 25 + spriteID: 3e77d95ab3c85b34ea5fd14d446bf9fd layerID: 118 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 220, y: 1477} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u6218\u795E" - spriteName: + spriteName: "\u6218\u795E" isGroup: 0 - parentIndex: 18 - spriteID: 1f17a49b71375e54fb5069105bd31b54 + parentIndex: 25 + spriteID: b193d53ce8a80484da03867971e64a5e layerID: 117 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1465, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7FC5\u8180" - spriteName: + spriteName: "\u7FC5\u8180" isGroup: 0 - parentIndex: 18 - spriteID: aa123ee7ee8f6b84caa7c253b0355811 + parentIndex: 25 + spriteID: ab510bc0ffc543540b2b754d3cab7421 layerID: 115 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1332, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 5" spriteName: isGroup: 1 parentIndex: -1 - spriteID: d6397623e1416014bb151ad5ab36a04c + spriteID: 02f253d7a45563545b927f7fb1411542 layerID: 76 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 + isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D 4" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D 4" isGroup: 0 - parentIndex: 22 - spriteID: e54050e6dd6fcc5488f42fbb5de91bbf + parentIndex: 29 + spriteID: cea8b0b7605c0c54ab3d426485b09cdd layerID: 112 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 239, y: 1279} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D 4" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D 4" isGroup: 0 - parentIndex: 22 - spriteID: b6eeaa6368f62044f8ad3036b45b8b8a + parentIndex: 29 + spriteID: 368e6355b7e2fc943849713ca976bb12 layerID: 111 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 133, y: 1525} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D 4" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D 4" isGroup: 0 - parentIndex: 22 - spriteID: 44e93d1bc8713f943b64327619d08169 + parentIndex: 29 + spriteID: 89eab67082379ac488bc325e0a5f4161 layerID: 110 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 240, y: 1865} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D 4" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D 4" isGroup: 0 - parentIndex: 22 - spriteID: 352460c9a1a4f404c8cf4e5f6efe2617 + parentIndex: 29 + spriteID: df2b0c986a3922149a52e89fc789c95b layerID: 109 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 4, y: 1865} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D 3" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D 3" isGroup: 0 - parentIndex: 22 - spriteID: ca579f9cee40a4645b260d7bd9798112 + parentIndex: 29 + spriteID: 6f4472be7f27b574d97767b7b6657081 layerID: 108 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 240, y: 1919} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D 3" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D 3" isGroup: 0 - parentIndex: 22 - spriteID: 44a53c30dbf0b6342815599396797c0e + parentIndex: 29 + spriteID: 6d54c7cb6967de140bbdcd184c58a85a layerID: 107 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 122, y: 1865} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D 3" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D 3" isGroup: 0 - parentIndex: 22 - spriteID: b5f56eab79311264db754cf7393420a4 + parentIndex: 29 + spriteID: 55155434b9da2784382cbd20ecd3cf7d layerID: 106 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 305} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D 3" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D 3" isGroup: 0 - parentIndex: 22 - spriteID: 4dd6a8cb1597c844c9b2c1d5df476dca + parentIndex: 29 + spriteID: 502abd0f6f127f843b335890fdff7490 layerID: 105 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 290, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D 2" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D 2" isGroup: 0 - parentIndex: 22 - spriteID: be390b29eadc0da40ac3f9e197a79fcb + parentIndex: 29 + spriteID: f8b4e648d9f61cc45b42e258971e8ce1 layerID: 96 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 359} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D 2" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D 2" isGroup: 0 - parentIndex: 22 - spriteID: a99a26832e4c57b45abb3280a9db397f + parentIndex: 29 + spriteID: 431e0bbb51285a843b27f33fd5bc23ad layerID: 95 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 408, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3 \u62F7\u8D1D" - spriteName: + spriteName: "\u7EC4 3 \u62F7\u8D1D" isGroup: 0 - parentIndex: 22 - spriteID: 9d6e215db33494047b333b0a945f98fa + parentIndex: 29 + spriteID: ff4eb9f3f691919438071589a90ab727 layerID: 94 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 413} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17 \u62F7\u8D1D" - spriteName: + spriteName: "\u56FE\u5C42 17 \u62F7\u8D1D" isGroup: 0 - parentIndex: 22 - spriteID: 9b72424802e606e4bb4edab9f3339319 + parentIndex: 29 + spriteID: 6b81bd27409ad054696e3d2b14198474 layerID: 93 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 526, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 3" - spriteName: + spriteName: "\u7EC4 3" isGroup: 0 - parentIndex: 22 - spriteID: e44b80126101200469325f0b34182734 + parentIndex: 29 + spriteID: 0cf8ba4d4877ccd4abe5930b62435464 layerID: 65 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 467} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 17" - spriteName: + spriteName: "\u56FE\u5C42 17" isGroup: 0 - parentIndex: 22 - spriteID: 6eb01a71397ff364b97a440832fbe1d2 + parentIndex: 29 + spriteID: 3594bd0d97516f14988f8a90c0f84a1b layerID: 67 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 644, y: 828} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 16" - spriteName: + spriteName: "\u56FE\u5C42 16" isGroup: 0 - parentIndex: 22 - spriteID: 6fbe431b38414724e87c9ffda804372d + parentIndex: 29 + spriteID: 3bb1179db97b89d4d9e43facfee6d983 layerID: 66 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 4, y: 1525} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u7EC4 1" - spriteName: + spriteName: "\u7EC4 1" isGroup: 0 parentIndex: -1 - spriteID: 8650cb9c43485ec4098812881fe762d5 + spriteID: 56d123866d1590646911c3d5d7c5c842 layerID: 131 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 290, y: 762} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u7EC4 2" - spriteName: + spriteName: "\u7EC4 2" isGroup: 0 parentIndex: -1 - spriteID: f9b4ff19e5102db4a84933b4951f7482 + spriteID: 49046f21b4b70f0459c8ff99b896ff06 layerID: 52 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1636, y: 4} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u56FE\u5C42 9" - spriteName: + spriteName: "\u56FE\u5C42 9" isGroup: 0 parentIndex: -1 - spriteID: 761bfaf1f5faa79458da50aea9c1e50e + spriteID: 3ce14310c0a61e74ca427751d18ebd00 layerID: 23 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1949, y: 146} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u83B7\u53D6" - spriteName: + spriteName: "\u83B7\u53D6" isGroup: 0 parentIndex: -1 - spriteID: 77dde697914f7ef45b789d96ea2dee08 + spriteID: bd14b2642a2c63e4c8dbe167d75a4ee6 layerID: 13 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 1793, y: 534} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u7EC4 8" spriteName: isGroup: 1 parentIndex: -1 - spriteID: a7fb44d9cb436fe4190d83371d0d6d1f + spriteID: fd39a1a2ecdf3db47938be44d5f75d15 layerID: 136 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 - - name: "\u56FE\u5C42 7" - spriteName: - isGroup: 0 - parentIndex: 42 - spriteID: 7380ca6114a225048af4d2114cd4d1a4 - layerID: 20 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 isVisible: 1 - - name: "\u56FE\u5C42 6" - spriteName: + - name: BY_paotai_011 + spriteName: BY_paotai_011 isGroup: 0 - parentIndex: 42 - spriteID: 53589e6ad85f1d346858334fb26a0e72 - layerID: 14 - mosaicPosition: {x: 0, y: 0} + parentIndex: 49 + spriteID: 5e1c945acb8744a4898f29889501c195 + layerID: 207 + mosaicPosition: {x: 1949, y: 274} flatten: 0 - isImported: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_016 + spriteName: BY_paotai_016 + isGroup: 0 + parentIndex: 49 + spriteID: 6105878f7e0076747ab5694f326984c9 + layerID: 206 + mosaicPosition: {x: 1949, y: 242} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_007 + spriteName: BY_paotai_007 + isGroup: 0 + parentIndex: 49 + spriteID: c9b8a995d7817824483d28627fd4ec64 + layerID: 205 + mosaicPosition: {x: 1531, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_043 + spriteName: BY_paotai_043 + isGroup: 0 + parentIndex: 49 + spriteID: ee40901f29eefe344b42a83a5ac4f52b + layerID: 210 + mosaicPosition: {x: 1636, y: 721} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_043 + spriteName: BY_paotai_043 + isGroup: 0 + parentIndex: 49 + spriteID: a63f3dd1191a90a43bb3de4b9fc1cce2 + layerID: 209 + mosaicPosition: {x: 122, y: 1981} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_043 + spriteName: BY_paotai_043 + isGroup: 0 + parentIndex: 49 + spriteID: 18e83b50ade58ea44a860095cd5cfccd + layerID: 208 + mosaicPosition: {x: 1108, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_076 + spriteName: BY_paotai_076 + isGroup: 0 + parentIndex: 49 + spriteID: d7e496c10305367449a2473bfcd51eac + layerID: 215 + mosaicPosition: {x: 1793, y: 649} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_074 + spriteName: BY_paotai_074 + isGroup: 0 + parentIndex: 49 + spriteID: cfef68de0bd270e4dbc885b9c2ee930c + layerID: 214 + mosaicPosition: {x: 868, y: 828} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_076 + spriteName: BY_paotai_076 + isGroup: 0 + parentIndex: 49 + spriteID: ccdcd3e0a9dcb394cadadc562bc7afb5 + layerID: 213 + mosaicPosition: {x: 4, y: 1182} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: BY_paotai_053 + spriteName: BY_paotai_053 + isGroup: 0 + parentIndex: 49 + spriteID: 391565b1b3f4a6040b4ebc9c8d22171f + layerID: 211 + mosaicPosition: {x: 4, y: 762} + flatten: 0 + isImported: 1 isVisible: 1 - name: "\u56FE\u5C42 1" - spriteName: + spriteName: "\u56FE\u5C42 1" isGroup: 0 parentIndex: -1 - spriteID: 3c0cb9b1296641540950dcb1d7d2fa3e + spriteID: 7fad730d38016c249af7d471aceff05d layerID: 2 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 4, y: 4} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 sharedRigPSDLayers: [] - pSDLayerImportSetting: [] + pSDLayerImportSetting: + - spriteId: 20af4a742c8bc2649b08323bdb273b29 + name: "\u6218\u795E" + layerId: 135 + flatten: 0 + isGroup: 0 + importLayer: 1 + - spriteId: 1f187b2e0fda54e4fb138c097033fdfd + name: "\u7FC5\u8180" + layerId: 134 + flatten: 0 + isGroup: 0 + importLayer: 1 importFileNodeState: 1 platformSettingsDirtyTick: 0 spriteSizeExpandChanged: 0 diff --git a/Assets/UIResources/Home/炮台/BY_paotai_007.png b/Assets/UIResources/Home/炮台/BY_paotai_007.png new file mode 100644 index 000000000..5999be507 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_007.png differ diff --git a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_007.png.meta similarity index 97% rename from Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta rename to Assets/UIResources/Home/炮台/BY_paotai_007.png.meta index 6933a75de..d22a23796 100644 --- a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta +++ b/Assets/UIResources/Home/炮台/BY_paotai_007.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9cef5a03e6de060458fb10455af7594f +guid: e1b25b6a92a92ca428d344aa254ee9c3 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -39,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/UIResources/Home/炮台/BY_paotai_011.png b/Assets/UIResources/Home/炮台/BY_paotai_011.png new file mode 100644 index 000000000..7519f3f15 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_011.png differ diff --git a/Assets/UIResources/Home/炮台/图层 7.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_011.png.meta similarity index 86% rename from Assets/UIResources/Home/炮台/图层 7.png.meta rename to Assets/UIResources/Home/炮台/BY_paotai_011.png.meta index d724a8e86..d36f8a65b 100644 --- a/Assets/UIResources/Home/炮台/图层 7.png.meta +++ b/Assets/UIResources/Home/炮台/BY_paotai_011.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb39b9f06bcad864b9a3393c0475384e +guid: 5c3d7eaf074f5dd4e82be674a6640d33 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/BY_paotai_016.png b/Assets/UIResources/Home/炮台/BY_paotai_016.png new file mode 100644 index 000000000..44465ec2e Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_016.png differ diff --git a/Assets/UIResources/Home/炮台/图层 6.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_016.png.meta similarity index 86% rename from Assets/UIResources/Home/炮台/图层 6.png.meta rename to Assets/UIResources/Home/炮台/BY_paotai_016.png.meta index f04c252dc..3dba247a7 100644 --- a/Assets/UIResources/Home/炮台/图层 6.png.meta +++ b/Assets/UIResources/Home/炮台/BY_paotai_016.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e289c58487160374aa7d2c86002aa09d +guid: 27c2a28bdddea6f4cab319e8977c8183 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/BY_paotai_026.png b/Assets/UIResources/Home/炮台/BY_paotai_026.png new file mode 100644 index 000000000..3e25ab0ee Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_026.png differ diff --git a/Assets/UIResources/Home/炮台/图层 14.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_026.png.meta similarity index 86% rename from Assets/UIResources/Home/炮台/图层 14.png.meta rename to Assets/UIResources/Home/炮台/BY_paotai_026.png.meta index b8ab7221e..c01744d43 100644 --- a/Assets/UIResources/Home/炮台/图层 14.png.meta +++ b/Assets/UIResources/Home/炮台/BY_paotai_026.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7c6d38dbea9d254fb95c266c19582f2 +guid: bf29f523458563e4ca7885a9f66b9e0b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/BY_paotai_042.png b/Assets/UIResources/Home/炮台/BY_paotai_042.png new file mode 100644 index 000000000..7493a80f1 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_042.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_042.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_042.png.meta new file mode 100644 index 000000000..57499db15 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_042.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 62a9cd565ba6d1f43bdcb888f638bfcb +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043 1.png b/Assets/UIResources/Home/炮台/BY_paotai_043 1.png new file mode 100644 index 000000000..c2a1323c1 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_043 1.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043 1.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_043 1.png.meta new file mode 100644 index 000000000..98433bb4b --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_043 1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b0b41bdf46328ff45acfe0b14a61e46d +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043 2.png b/Assets/UIResources/Home/炮台/BY_paotai_043 2.png new file mode 100644 index 000000000..e646f90df Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_043 2.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043 2.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_043 2.png.meta new file mode 100644 index 000000000..b7830ef43 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_043 2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: aca4597354c5baa4098d3a6076bc3c4b +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043.png b/Assets/UIResources/Home/炮台/BY_paotai_043.png new file mode 100644 index 000000000..dae01c15e Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_043.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_043.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_043.png.meta new file mode 100644 index 000000000..aefe4846f --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_043.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 07b1eb16c7c4bc7419170ea497bffc1d +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_053.png b/Assets/UIResources/Home/炮台/BY_paotai_053.png new file mode 100644 index 000000000..b4a816158 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_053.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_053.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_053.png.meta new file mode 100644 index 000000000..5373ca036 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_053.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 79e870810c2078548aaf9968e22f0832 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_069.png b/Assets/UIResources/Home/炮台/BY_paotai_069.png new file mode 100644 index 000000000..46e20aa82 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_069.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_069.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_069.png.meta new file mode 100644 index 000000000..0a97806d3 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_069.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 18dd84a8159dce34398994ca1162f3d6 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_074.png b/Assets/UIResources/Home/炮台/BY_paotai_074.png new file mode 100644 index 000000000..295e9f636 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_074.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_074.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_074.png.meta new file mode 100644 index 000000000..f538d6a29 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_074.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 1896339da90c61c4f8075c63f127a404 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_076 1.png b/Assets/UIResources/Home/炮台/BY_paotai_076 1.png new file mode 100644 index 000000000..e8650a6d9 Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_076 1.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_076 1.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_076 1.png.meta new file mode 100644 index 000000000..b83426a61 --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_076 1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cfc57c0891db0c94db3cfa564e382b18 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/BY_paotai_076.png b/Assets/UIResources/Home/炮台/BY_paotai_076.png new file mode 100644 index 000000000..b69e51a6a Binary files /dev/null and b/Assets/UIResources/Home/炮台/BY_paotai_076.png differ diff --git a/Assets/UIResources/Home/炮台/BY_paotai_076.png.meta b/Assets/UIResources/Home/炮台/BY_paotai_076.png.meta new file mode 100644 index 000000000..c86da62cc --- /dev/null +++ b/Assets/UIResources/Home/炮台/BY_paotai_076.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 35baf1322cb19bd45b504a8a64fd66b1 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/LCSGSL_btn01.png b/Assets/UIResources/Home/炮台/LCSGSL_btn01.png index 83cecc305..ae4f6f6e4 100644 Binary files a/Assets/UIResources/Home/炮台/LCSGSL_btn01.png and b/Assets/UIResources/Home/炮台/LCSGSL_btn01.png differ diff --git a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png b/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png deleted file mode 100644 index ee46a8476..000000000 Binary files a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png and /dev/null differ diff --git a/Assets/UIResources/Home/炮台/activity_monthgift_btn_left01.png b/Assets/UIResources/Home/炮台/activity_monthgift_btn_left01.png index 8475bee5f..5bde3d687 100644 Binary files a/Assets/UIResources/Home/炮台/activity_monthgift_btn_left01.png and b/Assets/UIResources/Home/炮台/activity_monthgift_btn_left01.png differ diff --git a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png index 91387d115..82660dfe4 100644 Binary files a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png and b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png differ diff --git a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta index 733b26680..b4af7adb4 100644 --- a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta +++ b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 8, y: 0, z: 8, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 + internalID: 0 vertices: [] indices: edges: [] diff --git a/Assets/UIResources/Home/炮台/godking_main_suipian_diaocan.png b/Assets/UIResources/Home/炮台/godking_main_suipian_diaocan.png index 1b4e46413..a79df2464 100644 Binary files a/Assets/UIResources/Home/炮台/godking_main_suipian_diaocan.png and b/Assets/UIResources/Home/炮台/godking_main_suipian_diaocan.png differ diff --git a/Assets/UIResources/Home/炮台/godking_main_suipianl_bottom.png b/Assets/UIResources/Home/炮台/godking_main_suipianl_bottom.png index 4727a6d5a..ca31cb5d0 100644 Binary files a/Assets/UIResources/Home/炮台/godking_main_suipianl_bottom.png and b/Assets/UIResources/Home/炮台/godking_main_suipianl_bottom.png differ diff --git a/Assets/UIResources/Home/炮台/全部 1.png b/Assets/UIResources/Home/炮台/全部 1.png new file mode 100644 index 000000000..3c6bb859f Binary files /dev/null and b/Assets/UIResources/Home/炮台/全部 1.png differ diff --git a/Assets/UIResources/Home/炮台/全部 1.png.meta b/Assets/UIResources/Home/炮台/全部 1.png.meta new file mode 100644 index 000000000..5bd41c046 --- /dev/null +++ b/Assets/UIResources/Home/炮台/全部 1.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c6acf13cf00637c43b166cbcc13ed858 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/全部.png b/Assets/UIResources/Home/炮台/全部.png new file mode 100644 index 000000000..2bc76b606 Binary files /dev/null and b/Assets/UIResources/Home/炮台/全部.png differ diff --git a/Assets/UIResources/Home/炮台/全部.png.meta b/Assets/UIResources/Home/炮台/全部.png.meta new file mode 100644 index 000000000..ab4862ff8 --- /dev/null +++ b/Assets/UIResources/Home/炮台/全部.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 892bb04876732ec4fb32653cc36d15ab +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/出战.png b/Assets/UIResources/Home/炮台/出战.png index b5378f43d..cf20a7312 100644 Binary files a/Assets/UIResources/Home/炮台/出战.png and b/Assets/UIResources/Home/炮台/出战.png differ diff --git a/Assets/UIResources/Home/炮台/图层 1.png b/Assets/UIResources/Home/炮台/图层 1.png index 3ff3641ee..2da2964ca 100644 Binary files a/Assets/UIResources/Home/炮台/图层 1.png and b/Assets/UIResources/Home/炮台/图层 1.png differ diff --git a/Assets/UIResources/Home/炮台/图层 1.png.meta b/Assets/UIResources/Home/炮台/图层 1.png.meta index 605e33e1d..137ae8f51 100644 --- a/Assets/UIResources/Home/炮台/图层 1.png.meta +++ b/Assets/UIResources/Home/炮台/图层 1.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/图层 10.png b/Assets/UIResources/Home/炮台/图层 10.png index 942c6d153..3e7caa17d 100644 Binary files a/Assets/UIResources/Home/炮台/图层 10.png and b/Assets/UIResources/Home/炮台/图层 10.png differ diff --git a/Assets/UIResources/Home/炮台/图层 10.png.meta b/Assets/UIResources/Home/炮台/图层 10.png.meta index 06d92ca7f..3fdc85a91 100644 --- a/Assets/UIResources/Home/炮台/图层 10.png.meta +++ b/Assets/UIResources/Home/炮台/图层 10.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/图层 14.png b/Assets/UIResources/Home/炮台/图层 14.png deleted file mode 100644 index 566c637e9..000000000 Binary files a/Assets/UIResources/Home/炮台/图层 14.png and /dev/null differ diff --git a/Assets/UIResources/Home/炮台/图层 16.png b/Assets/UIResources/Home/炮台/图层 16.png index 19b05fcf4..006c281b0 100644 Binary files a/Assets/UIResources/Home/炮台/图层 16.png and b/Assets/UIResources/Home/炮台/图层 16.png differ diff --git a/Assets/UIResources/Home/炮台/图层 16.png.meta b/Assets/UIResources/Home/炮台/图层 16.png.meta index 95895af43..9eb4bc5b3 100644 --- a/Assets/UIResources/Home/炮台/图层 16.png.meta +++ b/Assets/UIResources/Home/炮台/图层 16.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 30, y: 30, z: 32, w: 36} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 + internalID: 0 vertices: [] indices: edges: [] diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png b/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png new file mode 100644 index 000000000..f47766610 Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png.meta new file mode 100644 index 000000000..1fe666fdb --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝 2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 661fa744add74824caf72c512017c225 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png b/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png new file mode 100644 index 000000000..e3658ea21 Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png.meta new file mode 100644 index 000000000..8881ab4d5 --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝 3.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: bc2c81cd5c548d24a97d0bcacebbdea7 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png b/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png new file mode 100644 index 000000000..d8fc6ee1d Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png.meta new file mode 100644 index 000000000..5a47f68af --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝 4.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 63a232bc666f1704798e01d33927e921 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png b/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png new file mode 100644 index 000000000..e82344c6f Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png.meta new file mode 100644 index 000000000..9009b6efa --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝 5.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0ba736a431ad3904abc2969f67d0c634 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png b/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png new file mode 100644 index 000000000..b09571146 Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png.meta new file mode 100644 index 000000000..c68ec1661 --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝 6.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: fe65e23eba54c8f4c8047e2a3d48ff57 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝.png b/Assets/UIResources/Home/炮台/图层 17 拷贝.png new file mode 100644 index 000000000..1eef96f1b Binary files /dev/null and b/Assets/UIResources/Home/炮台/图层 17 拷贝.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17 拷贝.png.meta b/Assets/UIResources/Home/炮台/图层 17 拷贝.png.meta new file mode 100644 index 000000000..90bb2eba4 --- /dev/null +++ b/Assets/UIResources/Home/炮台/图层 17 拷贝.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9154d2afeef14d54d9e29718a90a2210 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 17.png b/Assets/UIResources/Home/炮台/图层 17.png index 2a7594ca0..726ae621d 100644 Binary files a/Assets/UIResources/Home/炮台/图层 17.png and b/Assets/UIResources/Home/炮台/图层 17.png differ diff --git a/Assets/UIResources/Home/炮台/图层 17.png.meta b/Assets/UIResources/Home/炮台/图层 17.png.meta index d139ad08d..9bf935997 100644 --- a/Assets/UIResources/Home/炮台/图层 17.png.meta +++ b/Assets/UIResources/Home/炮台/图层 17.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 34, y: 39, z: 35, w: 35} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 + internalID: 0 vertices: [] indices: edges: [] diff --git a/Assets/UIResources/Home/炮台/图层 19.png b/Assets/UIResources/Home/炮台/图层 19.png deleted file mode 100644 index 0fe0c65b1..000000000 Binary files a/Assets/UIResources/Home/炮台/图层 19.png and /dev/null differ diff --git a/Assets/UIResources/Home/炮台/图层 19.png.meta b/Assets/UIResources/Home/炮台/图层 19.png.meta deleted file mode 100644 index 61cea5155..000000000 --- a/Assets/UIResources/Home/炮台/图层 19.png.meta +++ /dev/null @@ -1,114 +0,0 @@ -fileFormatVersion: 2 -guid: 015fa2a7540494a4a8266312a91bd99d -TextureImporter: - internalIDToNameTable: [] - 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: 0 - 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: 3 - 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: 3 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 2.png b/Assets/UIResources/Home/炮台/图层 2.png index 830b63925..b404cfe5c 100644 Binary files a/Assets/UIResources/Home/炮台/图层 2.png and b/Assets/UIResources/Home/炮台/图层 2.png differ diff --git a/Assets/UIResources/Home/炮台/图层 2.png.meta b/Assets/UIResources/Home/炮台/图层 2.png.meta index cfc5f2bf2..6b168650a 100644 --- a/Assets/UIResources/Home/炮台/图层 2.png.meta +++ b/Assets/UIResources/Home/炮台/图层 2.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/图层 4.png b/Assets/UIResources/Home/炮台/图层 4.png index d366aa424..ae1dabd3c 100644 Binary files a/Assets/UIResources/Home/炮台/图层 4.png and b/Assets/UIResources/Home/炮台/图层 4.png differ diff --git a/Assets/UIResources/Home/炮台/图层 4.png.meta b/Assets/UIResources/Home/炮台/图层 4.png.meta index 6a591d301..d83b912ee 100644 --- a/Assets/UIResources/Home/炮台/图层 4.png.meta +++ b/Assets/UIResources/Home/炮台/图层 4.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/图层 6.png b/Assets/UIResources/Home/炮台/图层 6.png deleted file mode 100644 index e795e5494..000000000 Binary files a/Assets/UIResources/Home/炮台/图层 6.png and /dev/null differ diff --git a/Assets/UIResources/Home/炮台/图层 7.png b/Assets/UIResources/Home/炮台/图层 7.png deleted file mode 100644 index 12a187100..000000000 Binary files a/Assets/UIResources/Home/炮台/图层 7.png and /dev/null differ diff --git a/Assets/UIResources/Home/炮台/图层 9.png b/Assets/UIResources/Home/炮台/图层 9.png index bf07f1ad9..d3dcf857f 100644 Binary files a/Assets/UIResources/Home/炮台/图层 9.png and b/Assets/UIResources/Home/炮台/图层 9.png differ diff --git a/Assets/UIResources/Home/炮台/图层 9.png.meta b/Assets/UIResources/Home/炮台/图层 9.png.meta index 286900051..d19590856 100644 --- a/Assets/UIResources/Home/炮台/图层 9.png.meta +++ b/Assets/UIResources/Home/炮台/图层 9.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/已拥有.png b/Assets/UIResources/Home/炮台/已拥有.png new file mode 100644 index 000000000..87c0cf186 Binary files /dev/null and b/Assets/UIResources/Home/炮台/已拥有.png differ diff --git a/Assets/UIResources/Home/炮台/已拥有.png.meta b/Assets/UIResources/Home/炮台/已拥有.png.meta new file mode 100644 index 000000000..faa0f32a8 --- /dev/null +++ b/Assets/UIResources/Home/炮台/已拥有.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 28abe6729d976614684cc409a9b0e35d +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/已过期.png b/Assets/UIResources/Home/炮台/已过期.png new file mode 100644 index 000000000..4c2db8328 Binary files /dev/null and b/Assets/UIResources/Home/炮台/已过期.png differ diff --git a/Assets/UIResources/Home/炮台/已过期.png.meta b/Assets/UIResources/Home/炮台/已过期.png.meta new file mode 100644 index 000000000..943466d60 --- /dev/null +++ b/Assets/UIResources/Home/炮台/已过期.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 702c599f8e3effe439c4921c585b699e +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/战神 1.png b/Assets/UIResources/Home/炮台/战神 1.png index c3e56e1f1..ca6d00c2c 100644 Binary files a/Assets/UIResources/Home/炮台/战神 1.png and b/Assets/UIResources/Home/炮台/战神 1.png differ diff --git a/Assets/UIResources/Home/炮台/战神 1.png.meta b/Assets/UIResources/Home/炮台/战神 1.png.meta index 0697dab60..dae8d0824 100644 --- a/Assets/UIResources/Home/炮台/战神 1.png.meta +++ b/Assets/UIResources/Home/炮台/战神 1.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/战神.png b/Assets/UIResources/Home/炮台/战神.png index 4fd498a34..9371dc703 100644 Binary files a/Assets/UIResources/Home/炮台/战神.png and b/Assets/UIResources/Home/炮台/战神.png differ diff --git a/Assets/UIResources/Home/炮台/战神.png.meta b/Assets/UIResources/Home/炮台/战神.png.meta index 219f96230..b10080e0e 100644 --- a/Assets/UIResources/Home/炮台/战神.png.meta +++ b/Assets/UIResources/Home/炮台/战神.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/未拥有.png b/Assets/UIResources/Home/炮台/未拥有.png new file mode 100644 index 000000000..88071c184 Binary files /dev/null and b/Assets/UIResources/Home/炮台/未拥有.png differ diff --git a/Assets/UIResources/Home/炮台/未拥有.png.meta b/Assets/UIResources/Home/炮台/未拥有.png.meta new file mode 100644 index 000000000..2519317eb --- /dev/null +++ b/Assets/UIResources/Home/炮台/未拥有.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 89e2367e6f99acc47a7de5b1a980f301 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/激活.png b/Assets/UIResources/Home/炮台/激活.png index c4955e563..3560be2a4 100644 Binary files a/Assets/UIResources/Home/炮台/激活.png and b/Assets/UIResources/Home/炮台/激活.png differ diff --git a/Assets/UIResources/Home/炮台/炮台 1.png b/Assets/UIResources/Home/炮台/炮台 1.png index 9a03db7d3..20c354733 100644 Binary files a/Assets/UIResources/Home/炮台/炮台 1.png and b/Assets/UIResources/Home/炮台/炮台 1.png differ diff --git a/Assets/UIResources/Home/炮台/炮台 1.png.meta b/Assets/UIResources/Home/炮台/炮台 1.png.meta index ead586a3f..58b8ecbdb 100644 --- a/Assets/UIResources/Home/炮台/炮台 1.png.meta +++ b/Assets/UIResources/Home/炮台/炮台 1.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/炮台.png b/Assets/UIResources/Home/炮台/炮台.png index 76416585b..7b8119057 100644 Binary files a/Assets/UIResources/Home/炮台/炮台.png and b/Assets/UIResources/Home/炮台/炮台.png differ diff --git a/Assets/UIResources/Home/炮台/炮台.png.meta b/Assets/UIResources/Home/炮台/炮台.png.meta index 485e2dc9a..56e733e25 100644 --- a/Assets/UIResources/Home/炮台/炮台.png.meta +++ b/Assets/UIResources/Home/炮台/炮台.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/组 1.png b/Assets/UIResources/Home/炮台/组 1.png index bd351c9f8..cc8c15794 100644 Binary files a/Assets/UIResources/Home/炮台/组 1.png and b/Assets/UIResources/Home/炮台/组 1.png differ diff --git a/Assets/UIResources/Home/炮台/组 1.png.meta b/Assets/UIResources/Home/炮台/组 1.png.meta index 6f720e41a..cdb10570f 100644 --- a/Assets/UIResources/Home/炮台/组 1.png.meta +++ b/Assets/UIResources/Home/炮台/组 1.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/组 2.png b/Assets/UIResources/Home/炮台/组 2.png index 57954effc..da4e8a743 100644 Binary files a/Assets/UIResources/Home/炮台/组 2.png and b/Assets/UIResources/Home/炮台/组 2.png differ diff --git a/Assets/UIResources/Home/炮台/组 2.png.meta b/Assets/UIResources/Home/炮台/组 2.png.meta index 476a47b8d..547bd6968 100644 --- a/Assets/UIResources/Home/炮台/组 2.png.meta +++ b/Assets/UIResources/Home/炮台/组 2.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 2.png b/Assets/UIResources/Home/炮台/组 3 拷贝 2.png new file mode 100644 index 000000000..d8743f4db Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝 2.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 2.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝 2.png.meta new file mode 100644 index 000000000..9fe4883e8 --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝 2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 8757c12f21500ca4e9bd13786fc5af8e +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 3.png b/Assets/UIResources/Home/炮台/组 3 拷贝 3.png new file mode 100644 index 000000000..4b51f9a87 Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝 3.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 3.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝 3.png.meta new file mode 100644 index 000000000..885f81fbd --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝 3.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: def39583a77626a4b9f0e2b776c4c730 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 4.png b/Assets/UIResources/Home/炮台/组 3 拷贝 4.png new file mode 100644 index 000000000..153280e4c Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝 4.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 4.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝 4.png.meta new file mode 100644 index 000000000..1f3e48f79 --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝 4.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 483a254d3f9e65f4f8e973d883cb6aa8 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 5.png b/Assets/UIResources/Home/炮台/组 3 拷贝 5.png new file mode 100644 index 000000000..dfa127f8c Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝 5.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 5.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝 5.png.meta new file mode 100644 index 000000000..edf7180a8 --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝 5.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: fd96329502e1e814fb31bf326afd978a +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 6.png b/Assets/UIResources/Home/炮台/组 3 拷贝 6.png new file mode 100644 index 000000000..6c7379723 Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝 6.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝 6.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝 6.png.meta new file mode 100644 index 000000000..a868e4985 --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝 6.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a83b96af9ea6b654d99e88ae0cf75464 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝.png b/Assets/UIResources/Home/炮台/组 3 拷贝.png new file mode 100644 index 000000000..2ad61b283 Binary files /dev/null and b/Assets/UIResources/Home/炮台/组 3 拷贝.png differ diff --git a/Assets/UIResources/Home/炮台/组 3 拷贝.png.meta b/Assets/UIResources/Home/炮台/组 3 拷贝.png.meta new file mode 100644 index 000000000..d1ead1d35 --- /dev/null +++ b/Assets/UIResources/Home/炮台/组 3 拷贝.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: cf7558b4ba73f984793be758eae1fc43 +TextureImporter: + internalIDToNameTable: [] + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/组 3.png b/Assets/UIResources/Home/炮台/组 3.png index ee73f2f68..64d31f292 100644 Binary files a/Assets/UIResources/Home/炮台/组 3.png and b/Assets/UIResources/Home/炮台/组 3.png differ diff --git a/Assets/UIResources/Home/炮台/组 3.png.meta b/Assets/UIResources/Home/炮台/组 3.png.meta index bba67e1d9..84247c1ad 100644 --- a/Assets/UIResources/Home/炮台/组 3.png.meta +++ b/Assets/UIResources/Home/炮台/组 3.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/组 4.png b/Assets/UIResources/Home/炮台/组 4.png index 4665c3922..edf0b2c64 100644 Binary files a/Assets/UIResources/Home/炮台/组 4.png and b/Assets/UIResources/Home/炮台/组 4.png differ diff --git a/Assets/UIResources/Home/炮台/组 4.png.meta b/Assets/UIResources/Home/炮台/组 4.png.meta index 79d4419b7..3913c0cf9 100644 --- a/Assets/UIResources/Home/炮台/组 4.png.meta +++ b/Assets/UIResources/Home/炮台/组 4.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/翅膀 1.png b/Assets/UIResources/Home/炮台/翅膀 1.png index 5182e2a13..0a814335f 100644 Binary files a/Assets/UIResources/Home/炮台/翅膀 1.png and b/Assets/UIResources/Home/炮台/翅膀 1.png differ diff --git a/Assets/UIResources/Home/炮台/翅膀 1.png.meta b/Assets/UIResources/Home/炮台/翅膀 1.png.meta index 9004655b3..744400d20 100644 --- a/Assets/UIResources/Home/炮台/翅膀 1.png.meta +++ b/Assets/UIResources/Home/炮台/翅膀 1.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/翅膀.png b/Assets/UIResources/Home/炮台/翅膀.png index d76b1baae..5b36bd677 100644 Binary files a/Assets/UIResources/Home/炮台/翅膀.png and b/Assets/UIResources/Home/炮台/翅膀.png differ diff --git a/Assets/UIResources/Home/炮台/翅膀.png.meta b/Assets/UIResources/Home/炮台/翅膀.png.meta index 0b7d4e5c2..9845043e7 100644 --- a/Assets/UIResources/Home/炮台/翅膀.png.meta +++ b/Assets/UIResources/Home/炮台/翅膀.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: [] diff --git a/Assets/UIResources/Home/炮台/获取.png b/Assets/UIResources/Home/炮台/获取.png index b49a1eb93..f61f2458c 100644 Binary files a/Assets/UIResources/Home/炮台/获取.png and b/Assets/UIResources/Home/炮台/获取.png differ diff --git a/Assets/UIResources/Home/炮台/获取.png.meta b/Assets/UIResources/Home/炮台/获取.png.meta index c5cbe772f..a352436de 100644 --- a/Assets/UIResources/Home/炮台/获取.png.meta +++ b/Assets/UIResources/Home/炮台/获取.png.meta @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + 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: []