diff --git a/Assets/Art/UIPrefab/UIImageSelectMap.prefab b/Assets/Art/UIPrefab/UIImageSelectMap.prefab index 8a81c89a..9af254f0 100644 --- a/Assets/Art/UIPrefab/UIImageSelectMap.prefab +++ b/Assets/Art/UIPrefab/UIImageSelectMap.prefab @@ -31,6 +31,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1390155417629629485} - {fileID: 297002614467421397} - {fileID: 8066609909963987708} m_Father: {fileID: 8333043509333940129} @@ -688,7 +689,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: RightRowItem CustomComment: mComponentName: RectTransform --- !u!1 &4335887278641882288 @@ -725,7 +726,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0009866873} + m_AnchoredPosition: {x: 0, y: 0.0010159067} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!114 &1181747651547168674 @@ -951,6 +952,98 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &5467121100868014696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1390155417629629485} + - component: {fileID: 1866538296571855734} + - component: {fileID: 4273057749259065170} + - component: {fileID: 1871713937721577971} + m_Layer: 0 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1390155417629629485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467121100868014696} + 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: 5789014425176515348} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1866538296571855734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467121100868014696} + m_CullTransparentMesh: 1 +--- !u!114 &4273057749259065170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467121100868014696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9dfa64fda4defad4982e69c2303751b1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1871713937721577971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467121100868014696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: Frame + CustomComment: + mComponentName: UnityEngine.UI.Image --- !u!1 &5533578643516125822 GameObject: m_ObjectHideFlags: 0 @@ -1650,6 +1743,7 @@ GameObject: - component: {fileID: 297002614467421397} - component: {fileID: 1732335172120143055} - component: {fileID: 6562570408378941311} + - component: {fileID: 5364226635738202013} m_Layer: 0 m_Name: Name m_TagString: Untagged @@ -1673,8 +1767,8 @@ RectTransform: 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: -35.8323, y: 1.1181} - m_SizeDelta: {x: 164.1354, y: 27.7639} + m_AnchoredPosition: {x: -1.1024, y: -60.4} + m_SizeDelta: {x: 94.6757, y: 27.7639} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1732335172120143055 CanvasRenderer: @@ -1773,6 +1867,22 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5364226635738202013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7805304027728696555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: Name + CustomComment: + mComponentName: TMPro.TextMeshProUGUI --- !u!1 &7814570042150248306 GameObject: m_ObjectHideFlags: 0 @@ -1973,7 +2083,7 @@ MonoBehaviour: m_HandleRect: {fileID: 6608813160943937009} m_Direction: 2 m_Value: 0 - m_Size: 0.9999988 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2011,10 +2121,10 @@ RectTransform: - {fileID: 3635140821460037489} m_Father: {fileID: 5789014425176515348} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -61.2656, y: 0.9} - m_SizeDelta: {x: 100.9316, y: 70} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6611614184386924169 CanvasRenderer: @@ -2187,6 +2297,7 @@ MonoBehaviour: LeftItem: {fileID: 5092658527967839279} RightItem: {fileID: 6234933970462649390} RightRowItem: {fileID: 2384854260534447799} + Frame: {fileID: 0} --- !u!1 &8826357253905085134 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Projects/开发文档.meta b/Assets/Projects/开发文档.meta new file mode 100644 index 00000000..b7c6180e --- /dev/null +++ b/Assets/Projects/开发文档.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3b82f68214b3cc4dbf6a2751e9cdec8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/开发文档/~$（数学）立体几何体认知与计算脚本(2).xlsx.meta b/Assets/Projects/开发文档/~$（数学）立体几何体认知与计算脚本(2).xlsx.meta new file mode 100644 index 00000000..dde012cb --- /dev/null +++ b/Assets/Projects/开发文档/~$（数学）立体几何体认知与计算脚本(2).xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b592a7c08c78c9941b3a4c2595cf6dc3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/（数学）立体几何体认知与计算脚本(2).xlsx b/Assets/Projects/开发文档/（数学）立体几何体认知与计算脚本(2).xlsx similarity index 98% rename from Assets/Projects/（数学）立体几何体认知与计算脚本(2).xlsx rename to Assets/Projects/开发文档/（数学）立体几何体认知与计算脚本(2).xlsx index aae92e07..a270e9a4 100644 Binary files a/Assets/Projects/（数学）立体几何体认知与计算脚本(2).xlsx and b/Assets/Projects/开发文档/（数学）立体几何体认知与计算脚本(2).xlsx differ diff --git a/Assets/Projects/（数学）立体几何体认知与计算脚本(2).xlsx.meta b/Assets/Projects/开发文档/（数学）立体几何体认知与计算脚本(2).xlsx.meta similarity index 100% rename from Assets/Projects/（数学）立体几何体认知与计算脚本(2).xlsx.meta rename to Assets/Projects/开发文档/（数学）立体几何体认知与计算脚本(2).xlsx.meta diff --git a/Assets/Scripts/UI/UIImageSelectMap.Designer.cs b/Assets/Scripts/UI/UIImageSelectMap.Designer.cs index a9d9ebf0..a5e3d6c9 100644 --- a/Assets/Scripts/UI/UIImageSelectMap.Designer.cs +++ b/Assets/Scripts/UI/UIImageSelectMap.Designer.cs @@ -20,8 +20,11 @@ namespace QFramework.Example public UnityEngine.UI.Image RightItem; [SerializeField] public RectTransform RightRowItem; - - private UIImageSelectMapData mPrivateData = null; + + + + + private UIImageSelectMapData mPrivateData = null; protected override void ClearUIComponents() { @@ -30,8 +33,8 @@ namespace QFramework.Example LeftItem = null; RightItem = null; RightRowItem = null; - - mData = null; + + mData = null; } public UIImageSelectMapData Data diff --git a/Assets/Scripts/UI/UIImageSelectMap.cs b/Assets/Scripts/UI/UIImageSelectMap.cs index 5cc4b30d..df118e47 100644 --- a/Assets/Scripts/UI/UIImageSelectMap.cs +++ b/Assets/Scripts/UI/UIImageSelectMap.cs @@ -163,6 +163,8 @@ namespace QFramework.Example return; TextMeshProUGUI nameText = enterRight.transform.Find("Name").GetComponent(); + + Image Frame = enterRight.transform.Find("Frame").GetComponent(); bool isRight = false; // ȡȷķ @@ -179,12 +181,14 @@ namespace QFramework.Example // UI if (foundMatch) { + Frame.color = Color.green; nameText.color = Color.green; isRight = true; Debug.Log($"ȷƥ: {draggedItem.name} {categoryRow.name}"); } else { + Frame.color = Color.red; nameText.color = Color.red; Debug.Log($"ƥ: {draggedItem.name} {categoryRow.name}"); }