diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab similarity index 94% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab rename to ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab index a3873bac..f7d6dc5e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab @@ -291,8 +291,10 @@ GameObject: - component: {fileID: 5545682449418996990} - component: {fileID: 7526181906643281268} - component: {fileID: 7619122435525404041} + - component: {fileID: 8882143219709261918} + - component: {fileID: 2802567626561707494} m_Layer: 5 - m_Name: Card_v04-Common + m_Name: Card_v04.2-CommonForLook m_TagString: Card m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -372,7 +374,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4169693119190854323} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3} m_Name: @@ -413,7 +415,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4169693119190854323} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3} m_Name: @@ -451,7 +453,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4169693119190854323} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 523596fd7703bbe44a0c37d83fd5c880, type: 3} m_Name: @@ -465,6 +467,64 @@ MonoBehaviour: originPoint: {x: 0, y: 0, z: 0} UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} +--- !u!114 &8882143219709261918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2213389614096314727} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2802567626561707494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4169693119190854323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09549bb4d612106489300b62c6890846, type: 3} + m_Name: + m_EditorClassIdentifier: + cardEntity: {fileID: 8400832028529023394} + button: {fileID: 8882143219709261918} --- !u!1 &4343990849769966524 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab.meta similarity index 74% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab.meta index 6361ecd0..4a2e45bc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac682e0a421cffd439cc8edb17acf108 +guid: 6b012c33b9abd7b4ab44b2b165c9ccdb PrefabImporter: externalObjects: {} userData: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 98babe57..ccd8580e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -28092,11 +28092,11 @@ MonoBehaviour: levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} - commonCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} - legendaryCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} - rareCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} --- !u!4 &1690695890 Transform: @@ -30152,6 +30152,9 @@ MonoBehaviour: - levelColumn: [] - levelColumn: [] - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] monsterIcon: {fileID: 21300000, guid: 76c98050a10569a47b1a39a896495b71, type: 3} eliteMonsterIcon: {fileID: 21300000, guid: 646e58a8cd5cd2145bf0985299361fa8, type: 3} bossIcon: {fileID: 21300000, guid: a61b314c8ac7c44468531f8788cfafcc, type: 3} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index 747fb54a..850fe0b4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -1871,11 +1871,11 @@ MonoBehaviour: levelDevelopData: {fileID: 0} cardDeck: {fileID: 0} relicList: {fileID: 0} - commonCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} - legendaryCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} - rareCardForLook: {fileID: 4169693119190854323, guid: 85e79bc1f59ab6c4ba6b8b71a15238ee, + rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb, type: 3} --- !u!4 &198882545 Transform: @@ -22112,6 +22112,7 @@ MonoBehaviour: nodeColorResultImage: {fileID: 3463743346225269131, guid: 38f4837b968f61e4b94afcb5535f877c, type: 3} castRange: {fileID: 245886286661414085} + colorConditon: {fileID: 0} --- !u!224 &4372904059308576413 RectTransform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 7af0d311..de7eff34 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -342,7 +342,7 @@ public class CardEntity : MonoBehaviour string color = match.Groups[1].Value; // 颜色部分 string op = match.Groups[2].Value; // 运算符部分 string number = match.Groups[3].Value; // 数值部分 - int colorCount = getNodeTools.getNodesCount(color); + // int colorCount = getNodeTools.getNodesCount(color); Debug.Log("cardId是" + cardOriginalData.CardId + "conditonListindex是" + conditonListindex + "colorConditionindex是" + colorConditionindex ); GameObject nodeModule = conditionList[conditonListindex].transform.GetChild(colorConditionindex).gameObject; diff --git a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index 426b475e..ba418ccc 100644 Binary files a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ