TheStrongestSnail/Assets/Scripts/Conversion/Conversion.cs

@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class Conversion : BaseUIPanel
-{
-    public Button Button1;
-    public Button Button2;
-    public GameObject game;
-    void Start()
-    {
-        Button1.onClick.AddListener(() =>ButtononClick(ConversionItem.mode.ShellToEgg));
-        Button2.onClick.AddListener(() =>ButtononClick(ConversionItem.mode.EggToShell));
-    }
-    
-    void ButtononClick(ConversionItem.mode mymode)
-    {
-        Canvas canvas = GetComponentInParent<Canvas>();
-        
-        GameObject conver = Instantiate(game, canvas.transform);
-        conver.GetComponentInChildren<ConversionItem>().mymode = mymode;
-    }
-}

TheStrongestSnail/Assets/Scripts/Conversion/Conversion.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 530b2572632928c469745e8007fafce2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

TheStrongestSnail/Assets/Scripts/Conversion/ConversionItem.cs

@@ -6,7 +6,6 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json;
 
 public class ConversionItem : BaseUIPanel
 {
@@ -15,48 +14,18 @@ public class ConversionItem : BaseUIPanel
 
     public Button button1;
     public Button button2;
-
-
-    public Image Image1;
-    public Image Image2;
-    public Sprite shellSprite;
-    public Sprite eggSprite;
     public mode mymode = mode.ShellToEgg;
-    
-    public class coinsConvert
-    {
-        public float voluteCoin;
-        public float beansCoin;
-        public int convertType;
-    }
-
-
-    private async void Start()
+    private void Start()
     {
         inputField.onValueChanged.AddListener(GetInputData);
         button1.onClick.AddListener(() => CancelOnClick(button1));
         button2.onClick.AddListener(() => ConfirmOnClick(button2));
-        TextMeshProUGUI.text = "0";
-
-        //testhead = await testLogo();//测试登录
+        TextMeshProUGUI.text = "0"; 
     }
     public enum mode
     {
-        ShellToEgg = 0,//蜗壳转蜗蛋
-        EggToShell = 1//蜗蛋转蜗壳
-    }
-    private void Update()
-    {
-        if (mymode == mode.ShellToEgg)
-        {
-            Image1.sprite = shellSprite;
-            Image2.sprite = eggSprite;
-        }
-        else
-        {
-            Image2.sprite = shellSprite;
-            Image1.sprite = eggSprite;
-        }
+        ShellToEgg,
+        EggToShell
     }
     public async void CancelOnClick(Button button)//È¡Ïû°´Å¥
     {
@@ -66,44 +35,20 @@ public class ConversionItem : BaseUIPanel
     public async void ConfirmOnClick(Button button)//È·¶¨°´Å¥
     {
         await ButtonClickAnimationAsync(button.gameObject);
-        if (IsGreaterThanZeroDecimal(inputField.text))
-        {
-            coinsConvert body = new coinsConvert();
-            if (mymode == mode.ShellToEgg)
-            {
-                body.voluteCoin = float.Parse(inputField.text);
-                body.beansCoin = float.Parse(TextMeshProUGUI.text);
-            }
-            else
-            {
-                body.voluteCoin = float.Parse(TextMeshProUGUI.text);
-                body.beansCoin = float.Parse(inputField.text);
-            }
-            body.convertType = (int)mymode;
-            //string response = await web.SendRequest(web.URL + "/snail/user/coinsConvert", "POST", JsonUtility.ToJson(body), testhead);//测试
-            string response = await web.SendRequest(web.URL + "/snail/user/coinsConvert", "POST", JsonUtility.ToJson(body), Global.global.CreateHeaders());//正式接入
-            Debug.Log("入参:"+ JsonUtility.ToJson(body) + "       1.8返回: " + response);
-            ServerResponse18 serverResponse = JsonConvert.DeserializeObject<ServerResponse18>(response);    
-            addEventPopUp(serverResponse.message);
-            Destroy(gameObject);
-        }
-        else
-        {
-            addEventPopUp("请输入正确的数量");
-        }
+        Regex.IsMatch(inputField.text, @"^[1-9]\d*$");
+        addEventPopUp("²âÊÔµ¯´°");
     }
 
     public void GetInputData(string userInput)
     {
-        if (string.IsNullOrWhiteSpace(userInput) || !IsGreaterThanZeroDecimal(inputField.text)) {
+        if (string.IsNullOrWhiteSpace(userInput)) {
             userInput = "0";
         }
         TextMeshProUGUI.text = "0";
         if (mymode == mode.ShellToEgg)
-            TextMeshProUGUI.text = (float.Parse(userInput) * 3).ToString("F2");
+            TextMeshProUGUI.text = (int.Parse(userInput) * 3).ToString();
         if (mymode == mode.EggToShell)
-            TextMeshProUGUI.text = (float.Parse(userInput) / 3).ToString("F2");
-
+            TextMeshProUGUI.text = (int.Parse(userInput) / 3).ToString();
         ButtonClickAnimationAsync(TextMeshProUGUI.gameObject);
     }
 }

TheStrongestSnail/Assets/Scripts/Login/Global.cs

@@ -112,12 +112,7 @@ public class ServerResponse514: Response
 {
     public Data514 data;       // 数据对象
 }
-[Serializable]
-public class ServerResponse18 : Response
-{
-    public object data;       // 数据对象
-}
-[Serializable]
+
 public class Response
 {
     public int code;        // 响应状态码

TheStrongestSnail/Assets/Scripts/Scene_shop/BaseUIPanel.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using DG.Tweening;
-using System.Threading.Tasks;
 
 //panel基类，主要用于panel的显示和隐藏
 //初始化会隐藏Panel
@@ -32,25 +31,18 @@ public class BaseUIPanel : Base
     public virtual void ShopPanel()
     {
         Panel.gameObject.SetActive(true);
-        if (CloseBTN != null)
-        {
-            CloseBTN.gameObject.SetActive(false);
-        }
+        CloseBTN.gameObject.SetActive(true);
         Panel.transform.DOScale(1f, 0.3f);
     }
 
     /// <summary>
     /// 隐藏面板，可以重写
     /// </summary>
-    public virtual async Task HidePanel()
+    public virtual void HidePanel()
     {
        Panel.transform.DOScale(0.5f,0.2f);
-        if (CloseBTN != null)
-        {
-            CloseBTN.gameObject.SetActive(false);
-        }
+        CloseBTN.gameObject.SetActive(false);
         Panel.gameObject.SetActive(false);
-        await Task.Delay(200);
 
     }
 }

TheStrongestSnail/Assets/common/base/EventPopUp.cs

@@ -14,10 +14,10 @@ public class EventPopUp : MonoBehaviour
     {
         Canvas canvas = GetComponentInParent<Canvas>();
         float canvasHeight = canvas.GetComponent<RectTransform>().rect.height;
-        transform.DOMoveY(canvasHeight - (canvasHeight*0.3f), 1.5f);
+        transform.DOMoveY(canvasHeight - 200f, 1.5f);
         await Task.Delay(500);
         Image.DOColor(new Color(1f, 1f, 1f, 0f), 5f);
-        await Task.Delay(5100);
+        await Task.Delay(5000);
         Destroy(gameObject);
     }
 

TheStrongestSnail/Assets/common/base/base.cs

@@ -1,15 +1,13 @@
 using DG.Tweening;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class Base : MonoBehaviour
 {
-    public async Task ButtonClickAnimationAsync(GameObject button)//按钮动画
+    public async Task ButtonClickAnimationAsync(GameObject button)
     {
         TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
         Sequence mySequence = DOTween.Sequence();
@@ -21,46 +19,12 @@ public class Base : MonoBehaviour
         await tcs.Task;
     }
 
-    public void addEventPopUp(string Details)//添加弹窗
+    public void addEventPopUp(string Details)
     {
         GameObject prefab = Resources.Load<GameObject>("base/EventPopUp");
         Canvas canvas = GetComponentInParent<Canvas>();
         prefab.GetComponent<EventPopUp>().text = Details;
         Instantiate(prefab, canvas.transform);
     }
-    logoPanel.ServerResponse TestserverResponse;
-    protected Dictionary<string, string> testhead;
-    public async Task<Dictionary<string, string>> testLogo()//测试登录
-    {
 
-        LoginAndGetToken.loginbody body = new LoginAndGetToken.loginbody
-        {
-            userName = "15151658596",
-            password = "123456",
-            verifyCode = 111111
-        };
-        string loginResponse = await web.SendRequest(web.URL + "/snail/user/login", "POST", JsonUtility.ToJson(body));
-        logoPanel.ServerResponse response = JsonUtility.FromJson<logoPanel.ServerResponse>(loginResponse);
-        if (response != null && response.code == 200 && response.data != null)
-        {
-            TestserverResponse = response;
-            addEventPopUp("测试登录成功");
-
-            return new Dictionary<string, string>
-        {
-            { "Authorization", TestserverResponse.data.token }
-        };
-        }
-        addEventPopUp("测试登录失败");
-        return new Dictionary<string, string>();
-    }
-
-    public bool IsGreaterThanZeroDecimal(string text)//判断必须为小数而且大于0
-    {
-        // 使用正则表达式匹配大于0的小数
-        string pattern = @"^(?!0(\.0+)?$)(\d+(\.\d+)?|\.\d+)$";
-        Regex regex = new Regex(pattern);
-
-        return regex.IsMatch(text);
-    }
 }

TheStrongestSnail/Assets/res/AllUI/ui_145.png.meta

@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 1eb81db3ba5d67749baba23351f73479
-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: iPhone
-    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: