add

meng_yao/Assets/Resources/shader/CircleDissolveEffect.mat

@@ -113,7 +113,7 @@ Material:
     - _AlphaOutlineMinAlpha: 0
     - _AlphaOutlinePower: 1
     - _AlphaRoundThreshold: 0.5
-    - _AspectRatio: 0.5625
+    - _AspectRatio: 0.46153846
     - _BillboardY: 0
     - _BlurHD: 0
     - _BlurIntensity: 10
@@ -226,7 +226,7 @@ Material:
     - _PosterizeGamma: 0.75
     - _PosterizeNumColors: 8
     - _PosterizeOutline: 0
-    - _Radius: 0
+    - _Radius: 1
     - _RandomSeed: 0
     - _RectSize: 1
     - _RotateUvAmount: 0

meng_yao/Assets/Scenes/cultivation_gold_coin_Island.unity

@@ -788,7 +788,6 @@ GameObject:
   - component: {fileID: 109717919}
   - component: {fileID: 109717918}
   - component: {fileID: 109717923}
-  - component: {fileID: 109717922}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -880,19 +879,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &109717922
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 109717917}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea8231e49b8e6c440b4ede383765832d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  canvs: {fileID: 109717917}
 --- !u!114 &109717923
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6798,7 +6784,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1883297442}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.014378071, y: 0.0022006035, z: -24.20161}
+  m_LocalPosition: {x: 0.00003862381, y: 0.00182724, z: -24.20161}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

meng_yao/Assets/Scenes/main_scene.unity

@@ -359,9 +359,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 55e741d1aba3d0c44917e893f6a834b6, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

meng_yao/Assets/communal/mount.cs

@@ -22,11 +22,14 @@ public struct Login
 }
 
 
+
+
+
 public class mount : MonoBehaviour
 {
     public static mount mountitem;
     // Start is called before the first frame update
-    void Awake()
+   public virtual void Awake()
     {
         mountitem = this;
         DontDestroyOnLoad(this);

meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window_item.cs

@@ -25,7 +25,7 @@ public class input_box_pop_up_window_item : MonoBehaviour
         boxType = my_boxType;
         if (textobj != null) textobj.GetComponent<Text>().text = boxType.textName;
         if (promptobj != null) promptobj.GetComponent<Text>().text = boxType.prompt;
-       //if (iconobj != null) iconobj.GetComponent<Image>(). = boxType.icon;
+      // if (iconobj != null) iconobj.GetComponent<Image>(). = boxType.icon;
     }
     private void Update()
     {

meng_yao/Assets/script/ConnactServer/JinShaBuy.cs

@@ -32,6 +32,10 @@ public class JinShaBuy : mount
 {
 
     public int number=1;
+    public override void Awake()
+    {
+
+    }
     // Start is called before the first frame update
     void Start()
     {
@@ -44,7 +48,7 @@ public class JinShaBuy : mount
         
     }
 
-    public void Show_buy()//×¢²á½çÃæ
+    public void Show_buy()//¹ºÂòµ¯´°
     {
 
         List<BoxType> boxTypes = new List<BoxType>();

meng_yao/Assets/script/ConnactServer/Logo_in.cs

@@ -18,6 +18,10 @@ public class Logo_in : mount
     private float progress = 0f;
     private bool isLoading = false;
 
+    public override void Awake()
+    {
+        
+    }
     // Start is called before the first frame update
     void Start()
     {
@@ -70,6 +74,7 @@ public class Logo_in : mount
             {
                 Login login = new Login();
                 login.Phone = boxTypes[0].content;
+                Debug.Log(boxTypes[0].content);
                 //register.Code = boxTypes[0].content;
                 string jsonString = JsonUtility.ToJson(login);
                 string response = await web.SendRequest("http://47.109.133.52/Player/Login", "POST", jsonString);
@@ -117,7 +122,7 @@ public class Logo_in : mount
     {
         // 这里使用场景管理器进行跳转
         SceneManager.LoadScene(JumpScene.main_scene);
-        GameObject.Destroy(this.gameObject);
+
     }
 
  

meng_yao/Assets/script/JumpScene/SceneGuodu.cs

@@ -27,7 +27,11 @@ public class SceneGuodu : MonoBehaviour
     void loadEnd(Scene scene, LoadSceneMode mode)
     {
         Debug.Log("场景加载完成：" + scene.name);
-        mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = true;
+        if (mask != null )
+        {
+            mask.transform.GetComponent<CircleDissolveEffect>().isTransitioning = true;
+        }
+        
     }
     public async void SlideInAndLoadScene(string sceneName)
     {

meng_yao/Assets/script/Manager/Promptmgr.cs

@@ -83,7 +83,11 @@ public class Promptmgr : MonoBehaviour
 
         // 等待一段时间后销毁
         yield return new WaitForSeconds(1f); // 可调整的等待时间
-        Destroy(uielement.gameObject); // Ïú»ÙUIÔªËØ
+        if (uielement != null && uielement.gameObject != null)
+        {
+            Destroy(uielement.gameObject); // Ïú»ÙUIÔªËØ
+        }
+        
 
     }
 

meng_yao/Assets/script/cultivation_Jinsha_mine_slices/jinsha.cs

@@ -9,7 +9,8 @@ public class jinsha : mount
     public event OnClikeWT OnType;//点击事件
 
     public JinShaBuy go;
-    private void Awake()
+
+    public override void Awake()
     {
         intance = this;
     }

meng_yao/Assets/script/cultivation_Jinsha_mine_slices/room.cs

@@ -4,6 +4,8 @@ using UnityEngine;
 using TMPro;
 using System.Threading.Tasks;
 using Palmmedia.ReportGenerator.Core;
+using System;
+using System.Data;
 
 public class room : mount
 {
@@ -35,10 +37,16 @@ public class room : mount
         }
         ChangeTextPro();
        
+    }
 
+    private void OnEnable()
+    {        
         if (toolsNumber_text == null) return;
+           
         jinsha.intance.OnType += addman;
         jinsha.intance.OnType += addtools;
+
+
     }
 
     private void OnDisable()
@@ -65,12 +73,13 @@ public class room : mount
             PlayerManager.Instance.SetMoney(MoneyType.Stones, -10);
         }
 
-        Generate();
+      
         haveNumber--;
         toolsNumber--;
         UpdateShowCazhi();
         ChangeTextPro();
 
+          Generate();//是否有宝石
 
 
         //Vector3
@@ -111,6 +120,7 @@ public class room : mount
         UpdateShowCazhi();
         ChangeTextPro();
 
+        Generate();//是否有宝石
         //Vector3
         GameObject.Instantiate(Boom,new Vector3(startPos.position.x, startPos.position.y+0.5f, startPos.position.z-1f),Quaternion.identity);
         await Task.Delay(500);
@@ -206,11 +216,16 @@ public class room : mount
         }
     }
 
-    private bool Generate()
+    private async void Generate()
     {
+        string response = await web.SendRequest("http://47.109.133.52/FisherElfActive/GetListOfGem", "POST");
+        Debug.Log(response);
+        GetListOfGem  data= JsonUtility.FromJson<GetListOfGem>(response);
+        if (data.ErrorMessage == "")  
+        {
+            Debug.Log("连接成功");
+        }
 
-
-        return true;
     }
 
     //¿ªÍØ·¿¼ä
@@ -278,4 +293,25 @@ public class room : mount
 
 }
 
+public class GetListOfGem
+{
+    public List<Item> List;
+    public int ErrorCode;
+    public string ErrorMessage;
+}
+
+public class GetListOfGemItem
+{
+    public string Id;
+    public int Num;
+    public int Type;
+    public string OwnerId;
+    public int ActivateValue;
+    public int GenerateValue;
+    public int AlreadyGenerateValue;
+    public int RemainEndureTime;
+    public int EndureTime;
+    public string CreateDateTime;
+}
+
 

meng_yao/Assets/script/cultivation_gold_coin_Island/shopman.cs

@@ -8,7 +8,7 @@ public class shopman :mount
     public delegate void OnClikeWT(int type, int num);
     public event OnClikeWT OnType;//点击事件
     // Start is called before the first frame update
-    private void Awake()
+    public override void Awake()
     {
         instance = this;
     }