Merge pull request '信息弹窗优化0821' (#180) from dev45-0812 into dev45-0703NewVer

Reviewed-on: #180

ColorlessWorld-2024-4-2/Assets/MapNodeEnvironment/MapNodeEnvironment.cs

@@ -6,32 +6,56 @@ public class MapNodeEnvironment : MonoBehaviour
 {
     public GameObject inforObject;
     public Vector3 inforOffset;
-
+    [Header("延时计时器")]
+    public float time;
+    float currentTime;
+    public bool isShow;
+    private void Start()
+    {
+        currentTime = time;
+    }
     private void OnMouseEnter()
     {
         Debug.Log("½øÈë");   
-        if (inforObject != null && GameManager .Instance .onDrag ==false)
+    }
+
+    private void OnMouseOver()
+    {
+        if(isShow == false )
         {
-            inforObject.SetActive(true);
+            if (currentTime > 0)
-            //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
+            {
-            Vector3 screenPosition = Camera.main.WorldToScreenPoint(transform.position);
+                currentTime -= Time.deltaTime;
-            //设置距离
+            }
-            screenPosition.z = 7;
+            else
-            //将相机中的坐标转化为世界坐标
+            {
-            Vector3 positionInWorld = Camera.main.ScreenToWorldPoint(screenPosition);
+                isShow = true;
-            //物体跟随鼠标移动
+                //显示ui
-            inforObject.transform.position = positionInWorld;
+                if (inforObject != null && GameManager.Instance.onDrag == false)
-            inforObject.transform.localPosition += inforOffset;
+                {
+                    inforObject.SetActive(true);
+                    //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
+                    Vector3 screenPosition = Camera.main.WorldToScreenPoint(transform.position);
+                    //设置距离
+                    screenPosition.z = 7;
+                    //将相机中的坐标转化为世界坐标
+                    Vector3 positionInWorld = Camera.main.ScreenToWorldPoint(screenPosition);
+                    //物体跟随鼠标移动
+                    inforObject.transform.position = positionInWorld;
+                    inforObject.transform.localPosition += inforOffset;
 
+                }
+            }
         }
-    }
-
      
+    }
     private void OnMouseExit()
     {
         if (inforObject != null)
         {
             inforObject.SetActive(false);
         }
+        isShow = false;
+        currentTime = time;
     }
 }

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: -4270132608889474018}
   - component: {fileID: 6342757457008301573}
   - component: {fileID: 2778690875849209487}
+  - component: {fileID: 7128087568868009527}
   m_Layer: 0
   m_Name: Believer
   m_TagString: Untagged
@@ -83,6 +84,22 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 1
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7128087568868009527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428554102006219847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8dc69746d7e96c249a0105a35b50d0be, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforObject: {fileID: 1750499595799098494}
+  inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  isShow: 0
 --- !u!1 &1750499595799098494
 GameObject:
   m_ObjectHideFlags: 0
@@ -250,7 +267,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u706B\u5C71"
+  m_text: "\u4FE1\u5F92"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
   m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,
@@ -385,10 +402,11 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u56DE\u5408\u7ED3\u675F\u65F6\u5728\u5468\u56F4\u751F\u6210\u4E94\u4E2A\u7EA2\u8272\u5730\u5757"
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,
+    type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -451,7 +469,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5990552096368373457

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 1525171472041027406}
   - component: {fileID: 6342757457008301573}
   - component: {fileID: 2778690875849209487}
+  - component: {fileID: 7470075999252082373}
   m_Layer: 0
   m_Name: Bomb
   m_TagString: Untagged
@@ -83,6 +84,22 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 1
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7470075999252082373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428554102006219847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8dc69746d7e96c249a0105a35b50d0be, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforObject: {fileID: 1750499595799098494}
+  inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  isShow: 0
 --- !u!1 &1750499595799098494
 GameObject:
   m_ObjectHideFlags: 0
@@ -250,7 +267,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u706B\u5C71"
+  m_text: "\u70B8\u5F39"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
   m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,
@@ -385,7 +402,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u56DE\u5408\u7ED3\u675F\u65F6\u5728\u5468\u56F4\u751F\u6210\u4E94\u4E2A\u7EA2\u8272\u5730\u5757"
+  m_text: "\u88AB\u51FB\u4E2D\u65F6\u7206\u70B8"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab

@@ -310,6 +310,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inforObject: {fileID: 8932234629152251514}
   inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  isShow: 0
 --- !u!1 &6442116037409850337
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: -7273098934996385879}
   - component: {fileID: 6342757457008301573}
   - component: {fileID: 2778690875849209487}
+  - component: {fileID: 3481001194713140367}
   m_Layer: 0
   m_Name: Cultist
   m_TagString: Untagged
@@ -83,6 +84,22 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 1
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &3481001194713140367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428554102006219847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8dc69746d7e96c249a0105a35b50d0be, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforObject: {fileID: 1750499595799098494}
+  inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  isShow: 0
 --- !u!1 &1750499595799098494
 GameObject:
   m_ObjectHideFlags: 0
@@ -250,7 +267,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u706B\u5C71"
+  m_text: Cultist
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
   m_sharedMaterial: {fileID: -4989954011452443200, guid: d12673ed3c85b3743b660f41c0db6c7b,
@@ -385,7 +402,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u56DE\u5408\u7ED3\u675F\u65F6\u5728\u5468\u56F4\u751F\u6210\u4E94\u4E2A\u7EA2\u8272\u5730\u5757"
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d12673ed3c85b3743b660f41c0db6c7b, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/EnvironmentVFX/par_eff_environment_AcidRain.prefab

@@ -24682,6 +24682,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inforObject: {fileID: 2477856327853575819}
   inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  isShow: 0
 --- !u!135 &2784554828771723446
 SphereCollider:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab

@@ -98,6 +98,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inforObject: {fileID: 1750499595799098494}
   inforOffset: {x: 1, y: 0, z: 0}
+  time: 0.5
+  currentTime: 0.5
+  isShow: 0
 --- !u!1 &1750499595799098494
 GameObject:
   m_ObjectHideFlags: 0