diff --git a/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav new file mode 100644 index 00000000..04292e6e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav differ diff --git a/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav.meta b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav.meta new file mode 100644 index 00000000..c9c4c8b0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/1023.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f44b5427b062799468a1894cf3c8a8bf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3 b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3 new file mode 100644 index 00000000..5c43495d Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3 differ diff --git a/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3.meta b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3.meta new file mode 100644 index 00000000..1dc17f23 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Audio/BGM/fightBgm.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c0ec7af53bdbbfa4a99e8f1c4fe0b2c2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity index f20a0342..c0e61960 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity @@ -6772,7 +6772,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 878622857} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 776935412} + m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp + m_MethodName: LoadTargetLevel + m_Mode: 3 + 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 --- !u!114 &878622857 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity index 6b3d12e9..bb6fe401 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Event.unity @@ -1142,7 +1142,7 @@ MonoBehaviour: templatePlayerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2} playerState: {fileID: 0} - filePath: Assets/data/Event/Event.csv + filePath: Event.csv mainImage: {fileID: 2073127225} mainText: {fileID: 1289852736} backButton: {fileID: 489133018} @@ -1194,7 +1194,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2baf1ad43b1aba4e86e322c9f6a6a2a, type: 3} m_Name: m_EditorClassIdentifier: - filePath: Assets/data/Relic/Relic.csv + filePath: Relic.csv legacyPrefab: {fileID: 912575536458647953, guid: f7ef34fd26f50174ca53d4e5fc78e237, type: 3} legacyFather: {fileID: 101507822} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index fe347be3..17616db6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -15947,7 +15947,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 13807178} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp m_MethodName: QuitGame m_Mode: 1 @@ -17702,7 +17702,7 @@ MonoBehaviour: gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} - fightBGM: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3} + fightBGM: {fileID: 8300000, guid: f44b5427b062799468a1894cf3c8a8bf, type: 3} shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3} startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} UIClickSource: {fileID: 992566369} @@ -31984,7 +31984,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2baf1ad43b1aba4e86e322c9f6a6a2a, type: 3} m_Name: m_EditorClassIdentifier: - filePath: Assets/data/Relic/Relic.csv + filePath: Relic.csv legacyPrefab: {fileID: 912575536458647953, guid: f7ef34fd26f50174ca53d4e5fc78e237, type: 3} legacyFather: {fileID: 1748859173} diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity index b6ddf6ad..05bfd8e9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity @@ -19866,7 +19866,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2baf1ad43b1aba4e86e322c9f6a6a2a, type: 3} m_Name: m_EditorClassIdentifier: - filePath: Assets/data/Relic/Relic.csv + filePath: Relic.csv legacyPrefab: {fileID: 912575536458647953, guid: f7ef34fd26f50174ca53d4e5fc78e237, type: 3} legacyFather: {fileID: 1580547499} @@ -27602,6 +27602,7 @@ MonoBehaviour: type: 3} castRange: {fileID: 245886286661414085} colorConditon: {fileID: 0} + cardDataSummary: {fileID: 0} --- !u!224 &4372904059308576413 RectTransform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 3765a170..265d27db 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -604,7 +604,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1621631701} m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp m_MethodName: QuitGame m_Mode: 1 @@ -2135,7 +2135,7 @@ MonoBehaviour: gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} - fightBGM: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3} + fightBGM: {fileID: 8300000, guid: f44b5427b062799468a1894cf3c8a8bf, type: 3} shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3} startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} UIClickSource: {fileID: 1763913765} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs index 91e02112..eeefae97 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs @@ -63,8 +63,9 @@ public class LegacyManager : Singleton } - public void ReadRelicExcel(string filePath) + public void ReadRelicExcel(string fileName) { + string filePath = Path.Combine(Application.streamingAssetsPath, fileName); string[] lines = File.ReadAllLines(filePath); for (int i = 0; i < lines.Length; i++) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs index b9a2d484..7b89df60 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs @@ -39,8 +39,9 @@ public class EventManager : Singleton SetUpEvent(10001); } - public void ReadEventExcel(string filePath) + public void ReadEventExcel(string fileName) { + string filePath = Path.Combine(Application.streamingAssetsPath, fileName); string[] lines = File.ReadAllLines(filePath); // 跳过标题行（如果CSV文件有标题行的话） for (int i = 1; i < lines.Length; i++) diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv new file mode 100644 index 00000000..34f0ddf3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv @@ -0,0 +1,2 @@ +锘垮簭鍒楀彿,鍚嶇О,鏂囨湰,鍥剧墖璺緞,閫夐」涓暟,,, +10001,璁告効鏍,浣犲彂鐜颁簡涓妫靛法澶х殑鏍戞湪锛屽畠鐨勬灊鍙惰鐩栫潃鏁翠釜澶╃┖锛屾爲骞蹭笂缂犵粫鐫鍙戝厜鐨勮棨钄撱傛嵁璇村ぇ鏍戣兘瀹炵幇浜轰滑鐨勬効鏈涳紝浣嗕篃闇瑕佷粯鍑虹浉搴旂殑浠ｄ环銆傛爲鏈ㄧ殑鏋濆彾杞昏交鎽囨洺锛屼豢浣涘湪浣庤锛岄個璇蜂綘闈犺繎銆,Event/tree-1,3,浣犻棴涓婄溂鐫涳紝鍚戝ぇ鏍戠绁峰ぉ涓婁細鎺変笅50閲戝竵锛堣幏寰楀彂鍏夎棨鏇硷紝鏀跺埌15鐐逛激瀹筹級;鎽镐簡鎽稿ご涓婄殑鍖咃紝鏈夌偣鐤;Event/tree-2;1;50;2;-5,鐮嶄笅鍙戝厜鐨勮棨鏇硷紙鑾峰緱鍙戝厜钘ゆ浖锛屾敹鍒15鐐逛激瀹筹級;鏍戞湪鍙戝嚭鍤庡彨锛岄渿绌夸綘鐨勮宠啘锛岄鎰熶笉濡欐簻涔嬪ぇ鍚;Event/tree-2;2;-15;4;10001,浣犳劅鍙楀埌姊﹀涔嬫爲鐨勫己澶т笌绁炵锛屽喅瀹氫繚鎸佹暚鐣忎箣蹇冿紝涓嶈交鏄撴墦鎵板畠鐨勫畞闈欙紙鍋峰伔婧滆蛋锛;闅愮害鍚埌涓澹板徆鎭;Event/tree-2 diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv.meta b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv.meta new file mode 100644 index 00000000..435e0f50 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 20e6562206cdcc149bcd7a060724e83a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv new file mode 100644 index 00000000..31732d85 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv @@ -0,0 +1,12 @@ +锘1001,LegacyNode_MechanicalBoots,RelicsIcon/LegacyNode_StrongBody, +1002,LegacyNode_Scope,RelicsIcon/LegacyNode_StrongBody, +1003,LegacyNode_FireHeart,RelicsIcon/LegacyNode_FireHeart,FireHeart +1004,LegacyNode_Extractor,RelicsIcon/LegacyNode_StrongBody, +1005,LegacyNode_BoxLock,RelicsIcon/LegacyNode_StrongBody, +1006,LegacyNode_DamagedBag,RelicsIcon/LegacyNode_StrongBody, +1007,LegacyNode_LavaHeart,RelicsIcon/LegacyNode_StrongBody, +1008,LegacyNode_MagicGloves,RelicsIcon/LegacyNode_StrongBody, +1010,LegacyNode_FireSpark,RelicsIcon/LegacyNode_StrongBody, +1011,LegacyNode_GoldVines,RelicsIcon/LegacyNode_StrongBody, +1012,LegacyNode_CharcoalFire,RelicsIcon/LegacyNode_StrongBody, +10002,LegacyNode_StrongBody,RelicsIcon/LegacyNode_StrongBody,StrongBody diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv.meta b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv.meta new file mode 100644 index 00000000..ef7b78a7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f3d9ab1d937cdc4a9bde4bd557f8c02 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset index b64c3f1b..546980ed 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset +++ b/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset @@ -54,7 +54,7 @@ PlayerSettings: mipStripping: 0 numberOfMipsStripped: 0 numberOfMipsStrippedPerMipmapLimitGroup: {} - m_StackTraceTypes: 010000000100000001000000010000000100000001000000 + m_StackTraceTypes: 020000000200000002000000020000000200000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0