ui修改0714

ColorlessWorld-2024-4-2/Assets/Prefab/Relic/Image.prefab → ColorlessWorld-2024-4-2/Assets/Prefab/Relic/Relic.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 3517266222871449953}
   - component: {fileID: 4973472248603975134}
   m_Layer: 5
-  m_Name: Image
+  m_Name: Relic
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -89,6 +89,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   inforBar: {fileID: 0}
-  offSet: {x: 0, y: 0, z: 0}
+  offSet: {x: 1.5, y: 0, z: 0.1}
   layoutGroup: {fileID: 0}
   textAnchor: 1

ColorlessWorld-2024-4-2/Assets/Prefab/Relic/RelicInforTip.prefab

@@ -36,8 +36,8 @@ RectTransform:
   - {fileID: 6065930914584557401}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 300, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -127,7 +127,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 7.2625, y: -6.5822}
+  m_AnchoredPosition: {x: 7.262512, y: -6.5822144}
   m_SizeDelta: {x: 288.45, y: 59.8548}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5030735656716133214
@@ -206,7 +206,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -2.0034943, y: 1.6688995}
+  m_AnchoredPosition: {x: -2.003479, y: 1.6689453}
   m_SizeDelta: {x: 61.0356, y: 62.4165}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5460711310363232215
@@ -281,7 +281,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1.4873962, y: -33.218536}
+  m_AnchoredPosition: {x: 1.4874268, y: -33.218536}
   m_SizeDelta: {x: -11.5501, y: -66.4371}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4287330037165761715

ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab

@@ -552,7 +552,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   inforBar: {fileID: 0}
-  offSet: {x: 0, y: 0, z: 0}
+  offSet: {x: 0, y: 0, z: -0.7}
   layoutGroup: {fileID: 0}
   textAnchor: 1
 --- !u!1 &6570536712160286553

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -6871,7 +6871,7 @@ GameObject:
   - component: {fileID: 250893331}
   m_Layer: 5
   m_Name: WeaponSlot
-  m_TagString: WeaponSlot
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -17149,7 +17149,7 @@ GameObject:
   - component: {fileID: 457398708}
   m_Layer: 5
   m_Name: WeaponNode
-  m_TagString: Untagged
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -27346,7 +27346,7 @@ GameObject:
   - component: {fileID: 801073710}
   m_Layer: 5
   m_Name: WeaponSlot
-  m_TagString: WeaponSlot
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -37966,6 +37966,30 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
+      - m_Target: {fileID: 561576654}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        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_Target: {fileID: 1666118644}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        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_Target: {fileID: 1666118646}
         m_TargetAssemblyTypeName: SettingNode, Assembly-CSharp
         m_MethodName: RestartGame
@@ -42855,7 +42879,7 @@ GameObject:
   - component: {fileID: 1328831583}
   m_Layer: 5
   m_Name: WeaponSlot
-  m_TagString: WeaponSlot
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -45790,7 +45814,7 @@ GameObject:
   - component: {fileID: 1429520563}
   m_Layer: 5
   m_Name: WeaponSlot
-  m_TagString: WeaponSlot
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -57882,7 +57906,7 @@ GameObject:
   - component: {fileID: 1674521219}
   m_Layer: 5
   m_Name: WeaponSlot
-  m_TagString: WeaponSlot
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -59321,7 +59345,7 @@ GameObject:
   - component: {fileID: 1713025707}
   m_Layer: 5
   m_Name: WeaponNode
-  m_TagString: Untagged
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -61183,7 +61207,7 @@ MonoBehaviour:
   filePath: Relic.csv
   legacyPrefab: {fileID: 912575536458647953, guid: f7ef34fd26f50174ca53d4e5fc78e237,
     type: 3}
-  legacyFather: {fileID: 0}
+  legacyFather: {fileID: 1599887533}
   relicClassNameList: []
 --- !u!1 &1771873577
 GameObject:
@@ -67583,9 +67607,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   potionFather:
-  - {fileID: 0}
+  - {fileID: 542798810}
-  - {fileID: 0}
+  - {fileID: 1436796095}
-  - {fileID: 0}
+  - {fileID: 369957398}
   potionScale: {x: 0.6, y: 0.6, z: 0.6}
   potionPrefab: {fileID: 8666239901427763783, guid: 1d913e7493069154a9b3a59533b6f6ef,
     type: 3}
@@ -70862,7 +70886,7 @@ GameObject:
   - component: {fileID: 2109090872}
   m_Layer: 5
   m_Name: PlayerWeaponPanel
-  m_TagString: Untagged
+  m_TagString: WeaponDragPanel
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity

@@ -1683,18 +1683,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &71039892
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5033,18 +5021,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &265308273
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6878,18 +6854,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &390451068
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7561,18 +7525,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &431178199
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8622,6 +8574,30 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
+      - m_Target: {fileID: 1734403594}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        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_Target: {fileID: 405086592}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        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_Target: {fileID: 405086594}
         m_TargetAssemblyTypeName: SettingNode, Assembly-CSharp
         m_MethodName: RestartGame
@@ -9552,18 +9528,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &542062456
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -13172,18 +13136,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &718420599
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -17186,18 +17138,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &906511369
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -21894,18 +21834,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &1173798766
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -30111,18 +30039,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &1576156923
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -32155,18 +32071,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &1660113208
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -45113,18 +45017,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 405869355}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
 --- !u!114 &2146457979
 MonoBehaviour:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs

@@ -14,6 +14,12 @@ public class RelicSaleNode : MonoBehaviour
     {
         if (ShopManager.Instance.playerState.money >= price)
         {
+            //关闭详情界面
+            if (CardInfroBarManager.Instance . relicInforBar != null)
+            {
+                CardInfroBarManager.Instance.relicInforBar.SetActive(false);
+            }
+            //将遗物添加到玩家
             LegacyManager.Instance.CreateLegacyClassAsNew(relicName);
             ShopManager.Instance.playerState.money -= price;
             TipManager.Instance.SendGetItemTip("购买成功");

ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs

@@ -42,22 +42,26 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
 
     public void OnDrag(PointerEventData eventData)
     {
-        //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
+        GameObject targetObj = eventData.pointerCurrentRaycast.gameObject;
-        screenPosition = Camera.main.WorldToScreenPoint(transform.position);
+        if(targetObj.CompareTag("WeaponDragPanel"))
-        //获取鼠标在场景中坐标
+        {
-        mousePositionOnScreen = Input.mousePosition;
+            //获取鼠标在相机中（世界中）的位置，转换为屏幕坐标；
-        //让场景中的Z=鼠标坐标的Z
+            screenPosition = Camera.main.WorldToScreenPoint(transform.position);
-        mousePositionOnScreen.z = screenPosition.z;
+            //获取鼠标在场景中坐标
-        //将相机中的坐标转化为世界坐标
+            mousePositionOnScreen = Input.mousePosition;
-        mousePositionInWorld = Camera.main.ScreenToWorldPoint(mousePositionOnScreen);
+            //让场景中的Z=鼠标坐标的Z
-        //物体跟随鼠标移动
+            mousePositionOnScreen.z = screenPosition.z;
-        transform.position = mousePositionInWorld;
+            //将相机中的坐标转化为世界坐标
+            mousePositionInWorld = Camera.main.ScreenToWorldPoint(mousePositionOnScreen);
+            //物体跟随鼠标移动
+            transform.position = mousePositionInWorld;
+        }
     }
 
     public void OnEndDrag(PointerEventData eventData)
     {
         GameObject targetObj = eventData.pointerCurrentRaycast.gameObject;
-        if (targetObj.CompareTag("WeaponSlot"))//拖到交互点触发交互
+        if (targetObj.name == "WeaponSlot")//拖到交互点触发交互
         {
             if (targetObj.transform.childCount == 0)//子集没有物体，这是个空仓位，可以置入
             {

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip/RelicOnMouse.cs

@@ -24,7 +24,13 @@ public class RelicOnMouse : MonoBehaviour,IPointerEnterHandler, IPointerExitHand
         layoutGroup.childAlignment = textAnchor;
         inforBar.SetActive(true);
         //同步位置
-        inforBar.transform.position = transform.position + offSet;
+        //世界坐标转屏幕坐标
+        Vector3 screenPos = Camera.main.WorldToScreenPoint(transform.position);    
+        // 设置Z轴位置，这里假设为7
+        screenPos.z = 7f;
+        // 将屏幕坐标转换为世界坐标
+        Vector3 worldPosition = Camera.main.ScreenToWorldPoint(screenPos);
+        inforBar.transform.position = worldPosition + offSet;
         //删除以前的条目
         foreach (var tip in CardInfroBarManager.Instance.relicInforBarTipList)
         {
@@ -49,7 +55,6 @@ public class RelicOnMouse : MonoBehaviour,IPointerEnterHandler, IPointerExitHand
         CardInfroBarManager.Instance.relicInforBarTipList.Add(currentTip);
 
     }
-
     public void OnPointerExit(PointerEventData eventData)
     {
         isShow = false;

ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset

@@ -10,6 +10,7 @@ TagManager:
   - ServantSkillUI
   - ColorSlot
   - WeaponSlot
+  - WeaponDragPanel
   layers:
   - Default
   - TransparentFX