diff --git a/TheStrongestSnail/Assets/Resources/ListItem.prefab b/TheStrongestSnail/Assets/Resources/ListItem.prefab index dacdc47..7163d3f 100644 --- a/TheStrongestSnail/Assets/Resources/ListItem.prefab +++ b/TheStrongestSnail/Assets/Resources/ListItem.prefab @@ -380,10 +380,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 65.1 m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 diff --git a/TheStrongestSnail/Assets/Scenes/Scene_main.unity b/TheStrongestSnail/Assets/Scenes/Scene_main.unity index cfafb94..4d23a78 100644 --- a/TheStrongestSnail/Assets/Scenes/Scene_main.unity +++ b/TheStrongestSnail/Assets/Scenes/Scene_main.unity @@ -6246,6 +6246,7 @@ GameObject: m_Component: - component: {fileID: 1535452030} - component: {fileID: 1535452032} + - component: {fileID: 1535452033} m_Layer: 5 m_Name: t2_shop m_TagString: Untagged @@ -6297,6 +6298,24 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1535452029} m_CullTransparentMesh: 1 +--- !u!114 &1535452033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1535452029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4819444941766254cb5bde5ba335d38e, type: 3} + m_Name: + m_EditorClassIdentifier: + retbutton: {fileID: 0} + ClosureObj: {fileID: 0} + Panel: {fileID: 6389689318277710002, guid: 21918674044dc0640af7d47f2617dca5, type: 3} + CloseBTN: {fileID: 0} + btn: {fileID: 1588445222} + canvas: {fileID: 278122028} --- !u!1 &1546589077 GameObject: m_ObjectHideFlags: 0 @@ -7342,7 +7361,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1769459764} - - component: {fileID: 1769459765} m_Layer: 5 m_Name: scene_main m_TagString: Untagged @@ -7375,21 +7393,6 @@ RectTransform: m_AnchoredPosition: {x: -3760, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1769459765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769459763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4819444941766254cb5bde5ba335d38e, type: 3} - m_Name: - m_EditorClassIdentifier: - Panel: {fileID: 1588445218} - CloseBTN: {fileID: 0} - shop_btn: {fileID: 1588445222} --- !u!1 &1789658826 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/Scenes/logo.unity b/TheStrongestSnail/Assets/Scenes/logo.unity index ca952aa..950d59e 100644 --- a/TheStrongestSnail/Assets/Scenes/logo.unity +++ b/TheStrongestSnail/Assets/Scenes/logo.unity @@ -2415,6 +2415,7 @@ RectTransform: m_Children: - {fileID: 75329402} - {fileID: 204777934} + - {fileID: 1371930567} - {fileID: 2113932591} m_Father: {fileID: 0} m_RootOrder: 2 @@ -4218,6 +4219,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1358692575} m_CullTransparentMesh: 1 +--- !u!1 &1371930566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1371930567} + - component: {fileID: 1371930569} + - component: {fileID: 1371930568} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1371930567 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371930566} + 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: 667894482} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 811.0696} + m_SizeDelta: {x: 1086.5325, y: 293.8788} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1371930568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371930566} + 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: "\u5947\u8FF9\u8717\u725B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} + m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, 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: 261.8 + m_fontSizeBase: 261.8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + 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: 1 + 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!222 &1371930569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371930566} + m_CullTransparentMesh: 1 --- !u!1 &1416669330 GameObject: m_ObjectHideFlags: 0 @@ -5850,7 +5986,7 @@ RectTransform: m_Children: - {fileID: 1071890037} m_Father: {fileID: 667894482} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5895,6 +6031,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c7e45ea47af233042aae50e5524d917e, type: 3} m_Name: m_EditorClassIdentifier: + retbutton: {fileID: 0} userNameField: {fileID: 2007997901} passwordField: {fileID: 2068924169} verifyCodeField: {fileID: 345431930} diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/ListItem.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/ListItem.cs index 23c3fc5..7793365 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/ListItem.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/ListItem.cs @@ -19,20 +19,26 @@ public class ListItem : MonoBehaviour SetListImage(); ListBgImage(); } - + public void SetListImage()//设排名徽章背景颜色 { if (list == 1) { listImage.sprite = Resources.Load("bgYello"); + + nameText.color = new UnityEngine.Color(246/255f, 194/255f, 146 / 255f); } else if (list == 2) { listImage.sprite = Resources.Load("bgGreen"); + + nameText.color = new UnityEngine.Color(201 / 255f, 208/255f, 144 / 255f); } else if (list == 3) { listImage.sprite = Resources.Load("bgBlue"); + + nameText.color = new UnityEngine.Color(144/255f, 206 / 255f, 208/255f); } else { diff --git a/TheStrongestSnail/Assets/Scripts/Conversion/DonatePanelItem.cs b/TheStrongestSnail/Assets/Scripts/Conversion/DonatePanelItem.cs index 0b5d870..d608e52 100644 --- a/TheStrongestSnail/Assets/Scripts/Conversion/DonatePanelItem.cs +++ b/TheStrongestSnail/Assets/Scripts/Conversion/DonatePanelItem.cs @@ -11,17 +11,27 @@ public class DonatePanelItem : BaseUIPanel public Text NumberOfFreeSnailShells; public Text Fees; public Text Total; - + public Button Button; void Start() { - Recipient.onValueChanged.AddListener((userInput) => GetInputData(userInput, Recipient)); - GiftQuantity.onValueChanged.AddListener((userInput) => GetInputData(userInput, GiftQuantity)); GiftQuantity.onValueChanged.AddListener(GiftQuantityData); - + Button.onClick.AddListener(buttonOnClick); + + testLogo(); } - void GetInputData(string userInput, TMP_InputField tmp) + public class voluteCoinItem { - //ButtonClickAnimationAsync(tmp.gameObject,1.01f); + public string toCuteNo; + public int voluteCoin; + } + async void buttonOnClick() + { + + voluteCoinItem body = new voluteCoinItem(); + body.toCuteNo = Recipient.text; + body.voluteCoin = int.Parse(GiftQuantity.text); + string response = await web.SendRequest(web.URL + "/snail/transfer/voluteCoin", "POST", JsonUtility.ToJson(body), testhead);//测试 + Debug.Log(response); } async void GiftQuantityData(string userInput) { diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs b/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs index 4254b18..2c79193 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/main_shop.cs @@ -7,12 +7,13 @@ using DG.Tweening; public class main_shop :BaseUIPanel { - public Button shop_btn; - + [Header("一个按钮，按下有逻辑")] + public Button btn; + [Header("canvas，当动态生成的父节点")] public Canvas canvas; public override void Start() { - shop_btn.onClick.AddListener(() =>asyncOnShopBTN(shop_btn)); + btn.onClick.AddListener(() =>asyncOnShopBTN(btn)); } @@ -28,6 +29,8 @@ public class main_shop :BaseUIPanel public override void ShopPanel() { - GameObject.Instantiate(Panel, canvas.transform); + // 实例化 Panel 并设置缩放为 0.5 + GameObject newPanel = GameObject.Instantiate(Panel, canvas.transform); + newPanel.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f); } } diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs b/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs new file mode 100644 index 0000000..2d35512 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using System; +using UnityEngine; +using UnityEngine.UI; +using DG.Tweening; + +public class retrun_BTN :Base +{ + private void Start() + { + ClosureObj.transform.DOScale(1f,0.3f); + } + + +} diff --git a/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs.meta b/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs.meta new file mode 100644 index 0000000..eb78488 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Scene_main/retrun_BTN.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 74de365fa92f06a49a17acc53c84dc6c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/Scripts/Scene_shop/BaseUIPanel.cs b/TheStrongestSnail/Assets/Scripts/Scene_shop/BaseUIPanel.cs index a1773ff..42885a9 100644 --- a/TheStrongestSnail/Assets/Scripts/Scene_shop/BaseUIPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Scene_shop/BaseUIPanel.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; //请将panel挂载一个空节点上，将这个脚本放空节点 public class BaseUIPanel : Base { - [Header("显示隐藏的面板,根据重写，可以不给")] + [Header("显示or消失的面板,根据重写，可以不给")] public GameObject Panel; [Header("CloseBTN,根据重写，可以不给")] @@ -43,7 +43,7 @@ public class BaseUIPanel : Base Panel.gameObject.SetActive(true); if (CloseBTN != null) { - CloseBTN.gameObject.SetActive(false); + CloseBTN.gameObject.SetActive(true); } Panel.transform.DOScale(1f, 0.3f); } diff --git a/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs new file mode 100644 index 0000000..e6b93da --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using System.Threading.Tasks; +using UnityEngine; +using DG.Tweening; + +public class shopPanel :MonoBehaviour +{ + + + public void Start() + { + + + } + + + + +} diff --git a/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs.meta b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs.meta new file mode 100644 index 0000000..b36a529 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/Scene_shop/shopPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3c192bd726c790488c8fe8895226742 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/UIScene/Btn.png b/TheStrongestSnail/Assets/UIScene/Btn.png new file mode 100644 index 0000000..801b46d Binary files /dev/null and b/TheStrongestSnail/Assets/UIScene/Btn.png differ diff --git a/TheStrongestSnail/Assets/UIScene/Btn.png.meta b/TheStrongestSnail/Assets/UIScene/Btn.png.meta new file mode 100644 index 0000000..6173eea --- /dev/null +++ b/TheStrongestSnail/Assets/UIScene/Btn.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a267b8cc67b11b14a9e795b79d907a09 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/UIScene/gonghui.prefab b/TheStrongestSnail/Assets/UIScene/gonghui.prefab index 8b8ac63..a8f1f29 100644 --- a/TheStrongestSnail/Assets/UIScene/gonghui.prefab +++ b/TheStrongestSnail/Assets/UIScene/gonghui.prefab @@ -377,8 +377,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 24495a9bf1b669d4c9b1a36edfa55fc9, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a267b8cc67b11b14a9e795b79d907a09, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/TheStrongestSnail/Assets/common/base/base.cs b/TheStrongestSnail/Assets/common/base/base.cs index dab3d29..4d0a80e 100644 --- a/TheStrongestSnail/Assets/common/base/base.cs +++ b/TheStrongestSnail/Assets/common/base/base.cs @@ -10,6 +10,15 @@ using UnityEngine.UI; public class Base : MonoBehaviour { public Button retbutton; + public GameObject ClosureObj; + private void Awake() + { + if (retbutton != null) + { + retbutton.onClick.AddListener(() => CancelOnClick(retbutton, ClosureObj)); + } + + } public async Task ButtonClickAnimationAsync(GameObject button,float max=1.25f)//按钮动画 { TaskCompletionSource tcs = new TaskCompletionSource(); @@ -48,11 +57,12 @@ public class Base : MonoBehaviour addEventPopUp("测试登录成功"); testhead = new Dictionary - { - { "Authorization", TestserverResponse.data.token } - }; + { + { "Authorization", TestserverResponse.data.token } + }; + return; } - addEventPopUp("测试登录失败"); + addEventPopUp(response.message); testhead = new Dictionary(); } @@ -64,9 +74,17 @@ public class Base : MonoBehaviour return regex.IsMatch(text); } - public async void CancelOnClick(Button button)//取消按钮 + public async void CancelOnClick(Button button,GameObject my_gameObject = null)//取消按钮 { await ButtonClickAnimationAsync(button.gameObject); + if (my_gameObject != null) + { + Destroy(my_gameObject); + return; + } Destroy(gameObject); } + + + } diff --git a/TheStrongestSnail/Assets/font_textmeshpro/AlibabaPuHuiTi-3-95-ExtraBold/gl.asset b/TheStrongestSnail/Assets/font_textmeshpro/AlibabaPuHuiTi-3-95-ExtraBold/gl.asset index af070b0..95667a3 100644 --- a/TheStrongestSnail/Assets/font_textmeshpro/AlibabaPuHuiTi-3-95-ExtraBold/gl.asset +++ b/TheStrongestSnail/Assets/font_textmeshpro/AlibabaPuHuiTi-3-95-ExtraBold/gl.asset @@ -53,7 +53,7 @@ Material: - _ColorMask: 15 - _CullMode: 0 - _Diffuse: 0.5 - - _FaceDilate: 0 + - _FaceDilate: 0.16 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlowInner: 0.05 @@ -67,12 +67,12 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.37 + - _OutlineWidth: 0.33 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.90909094 - - _ScaleRatioB: 0.7386364 - - _ScaleRatioC: 0.7386364 + - _ScaleRatioB: 0.59318185 + - _ScaleRatioC: 0.59318185 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 diff --git a/TheStrongestSnail/Assets/prefabs/Convert2Panel.prefab b/TheStrongestSnail/Assets/prefabs/Convert2Panel.prefab index a4c6d73..160ad7d 100644 --- a/TheStrongestSnail/Assets/prefabs/Convert2Panel.prefab +++ b/TheStrongestSnail/Assets/prefabs/Convert2Panel.prefab @@ -166,6 +166,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee75c61d57c722e468ed4011fa66bea8, type: 3} m_Name: m_EditorClassIdentifier: + retbutton: {fileID: 0} Panel: {fileID: 158567709692854181} CloseBTN: {fileID: 0} inputField: {fileID: 6168167768698745100} diff --git a/TheStrongestSnail/Assets/prefabs/Donate2Panel.prefab b/TheStrongestSnail/Assets/prefabs/Donate2Panel.prefab index f4d3f26..a4efa44 100644 --- a/TheStrongestSnail/Assets/prefabs/Donate2Panel.prefab +++ b/TheStrongestSnail/Assets/prefabs/Donate2Panel.prefab @@ -121,19 +121,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3410210057816977128} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 4509579862271681879} - m_TargetAssemblyTypeName: BaseUIPanel, Assembly-CSharp - m_MethodName: - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!1 &821927266036662165 GameObject: m_ObjectHideFlags: 0 @@ -1327,13 +1315,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 02ca8bd802049024389ac844292ef713, type: 3} m_Name: m_EditorClassIdentifier: - Panel: {fileID: 0} + retbutton: {fileID: 3568963963287766741} + Panel: {fileID: 4509579862240682304} CloseBTN: {fileID: 0} Recipient: {fileID: 5167839042553029366} GiftQuantity: {fileID: 8527512286296714387} NumberOfFreeSnailShells: {fileID: 4509579860519678074} Fees: {fileID: 8527512285347044353} Total: {fileID: 8527512286273835625} + Button: {fileID: 3364760182085171127} --- !u!1 &5167839042247917623 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab index 42fe270..34c50de 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHui.prefab @@ -811,8 +811,27 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: retbutton + value: + objectReference: {fileID: 4445721933803330192} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: ClosureObj + value: + objectReference: {fileID: 8474050971548587742} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!114 &4445721933803330192 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4894555910357792270, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 9105878363237035166} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4445721933803330195 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab index 90b100c..ebc271d 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/GongHuiInfo.prefab @@ -726,6 +726,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: retbutton: {fileID: 0} + ClosureObj: {fileID: 0} id: 0 name: cover: @@ -2637,8 +2638,27 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: retbutton + value: + objectReference: {fileID: 3886062808532380616} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: ClosureObj + value: + objectReference: {fileID: 1001758454263862282} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!114 &3886062808532380616 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4894555910357792270, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 8503610989198433734} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &3886062808532380619 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} diff --git a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab index fcb5541..01921fc 100644 --- a/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab +++ b/TheStrongestSnail/Assets/prefabs/HYLPrefabs/MyGongHui.prefab @@ -1112,7 +1112,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1120,15 +1120,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1160,11 +1160,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 242.76 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -123.465 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1214,7 +1214,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1222,15 +1222,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1262,11 +1262,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 734.38 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -370.395 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1316,7 +1316,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1324,15 +1324,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1364,11 +1364,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 734.38 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -617.32495 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1418,7 +1418,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1426,15 +1426,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1466,11 +1466,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 242.76 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -370.395 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1520,7 +1520,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1528,15 +1528,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1568,11 +1568,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 734.38 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -123.465 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1622,7 +1622,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1630,15 +1630,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1670,11 +1670,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 242.76 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -617.32495 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1724,7 +1724,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1732,15 +1732,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1772,11 +1772,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 242.76 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -864.255 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1826,7 +1826,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.x @@ -1834,15 +1834,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 485.52 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 246.93 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalPosition.x @@ -1874,11 +1874,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 734.38 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -864.255 objectReference: {fileID: 0} - target: {fileID: 2389663774981101044, guid: 4405fb2ae3636bd4b9af816b943c743f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2018,8 +2018,27 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: retbutton + value: + objectReference: {fileID: 1949197724977761489} + - target: {fileID: 5044707777241721125, guid: dac544bca4358514d949413f04b4421c, type: 3} + propertyPath: ClosureObj + value: + objectReference: {fileID: 559402393922993362} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dac544bca4358514d949413f04b4421c, type: 3} +--- !u!114 &1949197724977761489 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4894555910357792270, guid: dac544bca4358514d949413f04b4421c, type: 3} + m_PrefabInstance: {fileID: 6404124906017438431} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1949197724977761490 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4894555910357792269, guid: dac544bca4358514d949413f04b4421c, type: 3} diff --git a/TheStrongestSnail/Assets/prefabs/LQPrefabs/InviteFriendPanel.prefab b/TheStrongestSnail/Assets/prefabs/LQPrefabs/InviteFriendPanel.prefab index 915be30..4cb92dd 100644 --- a/TheStrongestSnail/Assets/prefabs/LQPrefabs/InviteFriendPanel.prefab +++ b/TheStrongestSnail/Assets/prefabs/LQPrefabs/InviteFriendPanel.prefab @@ -1195,9 +1195,9 @@ RectTransform: m_Father: {fileID: 4178372325092396806} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 464, y: -123.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 880, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4537156719536544841 diff --git a/TheStrongestSnail/Assets/prefabs/retrun_BTN.prefab b/TheStrongestSnail/Assets/prefabs/retrun_BTN.prefab index af8cb8c..9980407 100644 --- a/TheStrongestSnail/Assets/prefabs/retrun_BTN.prefab +++ b/TheStrongestSnail/Assets/prefabs/retrun_BTN.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4894555910357792272} - component: {fileID: 4894555910357792271} - component: {fileID: 4894555910357792270} + - component: {fileID: 5044707777241721125} m_Layer: 5 m_Name: retrun_BTN m_TagString: Untagged @@ -134,6 +135,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &5044707777241721125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4894555910357792268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74de365fa92f06a49a17acc53c84dc6c, type: 3} + m_Name: + m_EditorClassIdentifier: + retbutton: {fileID: 0} + btn: {fileID: 4894555910357792270} + panel: {fileID: 0} --- !u!1 &4894555911772163770 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/prefabs/shopPanel.prefab b/TheStrongestSnail/Assets/prefabs/shopPanel.prefab index 18185d3..1a5d66f 100644 --- a/TheStrongestSnail/Assets/prefabs/shopPanel.prefab +++ b/TheStrongestSnail/Assets/prefabs/shopPanel.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 6389689318277710001} - component: {fileID: 6389689318277710007} - component: {fileID: 6389689318277710000} + - component: {fileID: 6226148154816690396} m_Layer: 5 m_Name: shopPanel m_TagString: Untagged @@ -77,6 +78,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6226148154816690396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6389689318277710002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c192bd726c790488c8fe8895226742, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6389689319143782425 PrefabInstance: m_ObjectHideFlags: 0 @@ -84,6 +97,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6389689318277710001} m_Modifications: + - target: {fileID: 499184974058266952, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} + propertyPath: panel + value: + objectReference: {fileID: 6389689318277710002} + - target: {fileID: 499184974058266952, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} + propertyPath: retbutton + value: + objectReference: {fileID: 6606596862899521146} + - target: {fileID: 499184974058266952, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} + propertyPath: ClosureObj + value: + objectReference: {fileID: 6389689318277710002} - target: {fileID: 5126270615579512174, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -179,3 +204,14 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5126270615579512174, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} m_PrefabInstance: {fileID: 6389689319143782425} m_PrefabAsset: {fileID: 0} +--- !u!114 &6606596862899521146 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 217268183994351203, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3} + m_PrefabInstance: {fileID: 6389689319143782425} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: