diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset index edb50235..ba056d9d 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -12,12 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3} m_Name: LevelState_1 m_EditorClassIdentifier: - levelStep: 0 + levelStep: 1 mapLevel: 1 currentPoint: {x: 1, y: 1} levelSaveMap: - levelDataList: - roomType: 13 + roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} isUse: 0 passBy: 0 nodePos: {x: -8.1901, y: 0.05970478, z: -7.539102} @@ -32,6 +33,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 13 + roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} isUse: 1 passBy: 0 nodePos: {x: -8.190107, y: 0.059706688, z: -6.4391036} @@ -47,6 +49,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 13 + roomSprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} isUse: 0 passBy: 0 nodePos: {x: -8.190113, y: 0.059708595, z: -5.339105} @@ -62,6 +65,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: -5.99012, y: 0.05971241, z: -7.539103} @@ -73,14 +77,14 @@ MonoBehaviour: enemyList: - 4007 - 4008 - - 4008 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: -5.9901237, y: 0.059714317, z: -6.4391055} line: 1 column: 1 @@ -100,6 +104,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: -5.9901257, y: 0.059716225, z: -5.339107} @@ -111,12 +116,14 @@ MonoBehaviour: enemyList: - 4007 - 4008 + - 4008 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 4 + - roomType: 9 + roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} isUse: 1 passBy: 0 nodePos: {x: -3.7901325, y: 0.05972004, z: -7.539102} @@ -132,7 +139,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 8 + - roomType: 12 + roomSprite: {fileID: 21300000, guid: 99d6cfcd8d628454989abc09534f0b64, type: 3} isUse: 1 passBy: 0 nodePos: {x: -3.7901382, y: 0.059721947, z: -6.4391065} @@ -148,7 +156,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 12 + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 00234b60ba12993428c782adbed08140, type: 3} isUse: 1 passBy: 0 nodePos: {x: -3.7901402, y: 0.059723854, z: -5.339107} @@ -166,6 +175,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: -1.5901484, y: 0.05972767, z: -7.539104} @@ -176,14 +186,15 @@ MonoBehaviour: - {x: 4, y: 0} fightEenemyPool: weak enemyList: - - 4007 - - 4008 - - 4008 + - 4003 + - 4003 + - 4004 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: -1.5901523, y: 0.059729576, z: -6.4391055} @@ -194,14 +205,14 @@ MonoBehaviour: - {x: 4, y: 1} fightEenemyPool: weak enemyList: - - 4003 - - 4003 - - 4004 + - 4007 + - 4008 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: -1.5901561, y: 0.059731483, z: -5.339107} @@ -219,7 +230,8 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 11 + - roomType: 6 + roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 0.6098423, y: 0.0597353, z: -7.539102} @@ -235,7 +247,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 6 + - roomType: 4 + roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 0.6098404, y: 0.059737206, z: -6.4391055} @@ -251,7 +264,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 10 + - roomType: 9 + roomSprite: {fileID: 21300000, guid: 2b6cbc9fb953ffc4eb02968e26d8f0cb, type: 3} isUse: 1 passBy: 0 nodePos: {x: 0.60983753, y: 0.059739113, z: -5.339106} @@ -269,6 +283,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 7 + roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 2.809836, y: 0.059742928, z: -7.539102} @@ -283,6 +298,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 7 + roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 2.8098352, y: 0.059744835, z: -6.4391036} @@ -301,6 +317,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 7 + roomSprite: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 2.8098352, y: 0.059746742, z: -5.339105} @@ -316,6 +333,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 5.0098357, y: 0.059750557, z: -7.5391} @@ -332,6 +350,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 5.0098357, y: 0.059752464, z: -6.4391055} @@ -351,7 +370,8 @@ MonoBehaviour: mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 2 + - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 5.0098357, y: 0.05975437, z: -5.339107} @@ -359,18 +379,17 @@ MonoBehaviour: column: 2 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: eliteAndMonster + fightEenemyPool: strong enemyList: - - 4005 - - 4006 - extraEnemyList: - - 4007 - - 4008 + - 4017 + - 4018 + extraEnemyList: [] mapIndex: 100001 - extraMapIndex: 100001 + extraMapIndex: isExtra: 0 - levelDataList: - roomType: 6 + roomSprite: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.2098393, y: 0.059758186, z: -7.539102} @@ -386,7 +405,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 9 + - roomType: 10 + roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.20984, y: 0.059760094, z: -6.4391065} @@ -402,7 +422,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 10 + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 1 passBy: 0 nodePos: {x: 7.2098417, y: 0.059762, z: -5.339107} @@ -420,6 +441,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.409845, y: 0.059765816, z: -7.539104} @@ -436,7 +458,8 @@ MonoBehaviour: mapIndex: 100001 extraMapIndex: isExtra: 0 - - roomType: 0 + - roomType: 1 + roomSprite: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.409847, y: 0.059767723, z: -6.4391055} @@ -445,15 +468,16 @@ MonoBehaviour: fatherLevelNodes: [] nextLevelNodes: - {x: 9, y: 1} - fightEenemyPool: strong + fightEenemyPool: elite enemyList: - - 4017 - - 4018 + - 4005 + - 4006 extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.409851, y: 0.05976963, z: -5.339107} @@ -471,7 +495,8 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 9 + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609858, y: 0.059773445, z: -7.539102} @@ -488,6 +513,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 4 + roomSprite: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609861, y: 0.059775352, z: -6.4391055} @@ -503,7 +529,8 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 12 + - roomType: 10 + roomSprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3} isUse: 1 passBy: 0 nodePos: {x: 11.609866, y: 0.05977726, z: -5.339106} @@ -520,7 +547,8 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 2 + - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 13.809872, y: 0.059781075, z: -7.539102} @@ -528,17 +556,16 @@ MonoBehaviour: column: 0 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: eliteAndMonster + fightEenemyPool: strong enemyList: - - 4005 - - 4006 - extraEnemyList: - - 4007 - - 4008 + - 4017 + - 4018 + extraEnemyList: [] mapIndex: 100001 - extraMapIndex: 100001 + extraMapIndex: isExtra: 0 - - roomType: 0 + - roomType: 2 + roomSprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3} isUse: 1 passBy: 0 nodePos: {x: 13.8098755, y: 0.059782982, z: -6.4391055} @@ -550,15 +577,19 @@ MonoBehaviour: - {x: 9, y: 2} nextLevelNodes: - {x: 11, y: 1} - fightEenemyPool: strong + fightEenemyPool: eliteAndMonster enemyList: - - 4017 - - 4018 - extraEnemyList: [] + - 4005 + - 4006 + extraEnemyList: + - 4003 + - 4003 + - 4004 mapIndex: 100001 - extraMapIndex: + extraMapIndex: 100001 isExtra: 0 - roomType: 0 + roomSprite: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 13.809877, y: 0.05978489, z: -5.339107} @@ -576,6 +607,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 0 passBy: 0 nodePos: {x: 16.009886, y: 0.059788704, z: -7.539103} @@ -590,6 +622,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 1 passBy: 0 nodePos: {x: 16.009893, y: 0.05979061, z: -6.4391065} @@ -606,6 +639,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3} isUse: 0 passBy: 0 nodePos: {x: 16.009895, y: 0.05979252, z: -5.339108} @@ -621,6 +655,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 5 + roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 18.209911, y: 0.059796333, z: -7.539104} @@ -635,6 +670,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 5 + roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 18.20992, y: 0.05979824, z: -6.4391065} @@ -651,6 +687,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 5 + roomSprite: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 18.209927, y: 0.059800148, z: -5.339107} @@ -666,6 +703,7 @@ MonoBehaviour: isExtra: 0 - levelDataList: - roomType: 3 + roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 20.409945, y: 0.059803963, z: -7.039104} @@ -680,6 +718,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 3 + roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 1 passBy: 0 nodePos: {x: 20.409952, y: 0.05980587, z: -5.9391055} @@ -695,6 +734,7 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - roomType: 3 + roomSprite: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} isUse: 0 passBy: 0 nodePos: {x: 20.40996, y: 0.059807777, z: -4.839107} diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset index 646542a8..0eb69ee1 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PotionList.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: PotionList m_EditorClassIdentifier: potionList: - - 6001 + - 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta new file mode 100644 index 00000000..1d182472 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b07afdbcf13e43438545d591cfd2e4b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta deleted file mode 100644 index 17bba4e5..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: a94cf6fef2879da4c91e5ef768aadf4e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab index 2cd4103f..be15cbd7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/PotionPrefab/PotionNode.prefab @@ -615,7 +615,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: 0, y: -109} + m_AnchoredPosition: {x: 0, y: -80.6} m_SizeDelta: {x: 0, y: -40.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4976694131413595396 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index a1e57ed4..c21d1ba0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -41252,8 +41252,8 @@ RectTransform: m_Children: - {fileID: 1383710168} - {fileID: 22579731} - - {fileID: 506806766} - {fileID: 1143340466} + - {fileID: 506806766} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -57603,6 +57603,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8bfdec5ed77d820469d77443cfb386a8, type: 3} m_Name: m_EditorClassIdentifier: + desIconFather: {fileID: 0} + monsterIcon: {fileID: 0} + eliteMonsterIcon: {fileID: 0} + eliteAndMonsterIcon: {fileID: 0} + bossIcon: {fileID: 0} + shopIcon: {fileID: 0} + campfireIcon: {fileID: 0} + incidentIcon: {fileID: 0} + treasureIcon: {fileID: 0} + forgingIcon: {fileID: 0} + deleteCardIcon: {fileID: 0} + addCardIcon: {fileID: 0} + resourceIcon: {fileID: 0} + potionIcon: {fileID: 0} + startIcon: {fileID: 0} --- !u!4 &1968320911 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs index fdd3247e..06e91125 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs @@ -44,31 +44,41 @@ public class PotionManager : Singleton for (int i=0;i(); - //添加效果 - string[] effectArry = potionData[3].Split(";"); - for(int i=0;i(); + //添加效果 + string[] effectArry = potionData[3].Split(";"); + for (int i = 0; i < effectArry.Length; i += 2) + { + potionNode.potionEffect.Add(int.Parse(effectArry[i]), effectArry[i + 1]); + } + //添加ID + potionNode.potionID = potionData[0]; + //添加名字 + potionNode.nameText.text = potionData[1]; + //添加描述 + potionNode.desctiptionText.text = potionData[2]; + //添加图片 + potionNode.icon.sprite = ToolDontDestory.Instance.LoadImage(potionData[4]); - return potion; + return potion; + } + else + { + return null; + } } public IEnumerator PotionEffect(int caseIndex,string amount) {