kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

新增BGM音乐

Browse Source
This commit is contained in:
kawagiri 2025-10-31 13:39:10 +08:00
parent f819c2a434
commit 90bf7133d3
22 changed files with 663 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tools/Multilingual.xlsx
View File

Binary file not shown.

BIN
Unity/Assets/Resources/Audio/ByakurenBritish.wav Normal file
View File

Binary file not shown.

23
Unity/Assets/Resources/Audio/ByakurenBritish.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: b6c0b2b9b354ce94cbf2b668fbf2fba0
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:

BIN
Unity/Assets/Resources/Audio/MikoPersian.wav Normal file
View File

Binary file not shown.

23
Unity/Assets/Resources/Audio/MikoPersian.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: b555babd22b0e19439302c769dd7052d
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:

BIN
Unity/Assets/Resources/Audio/ReimuNorway.wav Normal file
View File

Binary file not shown.

23
Unity/Assets/Resources/Audio/ReimuNorway.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 1bcf97b5e2be0434288bfcd87f293ef7
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:

8
Unity/Assets/Resources/DataAssets/PlayerDataAssets.asset
View File

@ -35,6 +35,7 @@ MonoBehaviour:
- "\u4F60\u5C31\u662F\u4ECA\u5929\u7684\u4F59\u5174\u8282\u76EE\u5417\uFF1F"
LoseChatBubble:
- "\u53EF\u6076\uFF01\u6211\u8FD8\u4F1A\u518D\u56DE\u6765\u7684\uFF01"
MusicName: RemiliaEgyptian
- ForceId: 1
CivId: 1
CivName: "\u6CD5\u5170\u897F"
@ -60,6 +61,7 @@ MonoBehaviour:
- "\u7528\u811A\u73A9\u679C\u7136\u6CA1\u90A3\u4E48\u7B80\u5355\u554A\u2026\u2026"
- "\u8F93\u4E86\uFF1F\u4ECA\u665A\u6CA1\u996D\u5403\u4E86\u54E6\uFF0C\u94C3\u4ED9~"
- "\u5567\uFF0C\u90FD\u602A\u59B9\u7EA2\u90A3\u4E2A\u6DF7\u86CB\u2026\u2026"
MusicName: KaguyaFrench
- ForceId: 2
CivId: 2
CivName: "\u5FB7\u610F\u5FD7"
@ -88,6 +90,7 @@ MonoBehaviour:
- "\u795E\u660E\u4ECE\u4E0D\u7834\u4EA7\uFF0C\u8D44\u4EA7\u91CD\u7EC4\u7F62\u4E86\u3002"
- "\u8FD9\u4E2A\u4E16\u754C\uFF0C\u5FD8\u8BB0\u4E86\u5C71\u795E\u7684\u91CD\u91CF\u2026\u2026"
- "\u5F88\u4E45\u2026\u2026\u6CA1\u6709\u8FD9\u79CD\u632B\u8D25\u611F\u4E86\u3002"
MusicName: KanakoGermany
- ForceId: 3
CivId: 3
CivName: "\u5370\u5EA6"
@ -108,6 +111,7 @@ MonoBehaviour:
LoseChatBubble:
- "\u54CE\u5440\uFF0C\u8FD8\u771F\u662F\u610F\u5916\u5462"
- "\u963F\u7A7A\uFF0C\u963F\u71D0\uFF0C\u56DE\u5BB6\u4E86\u54E6\uFF01"
MusicName: SatoriIndian
- ForceId: 4
CivId: 4
CivName: "\u7EF4\u4EAC"
@ -129,6 +133,7 @@ MonoBehaviour:
- "\u53EF\u6076\uFF0C\u62A5\u540D\u8D39\u80FD\u9000\u5417\uFF1F"
- "\u4F60\u4EEC\u53EF\u522B\u5F97\u610F\u5FD8\u5F62\u4E86\uFF01"
- "\u6211\u5C31\u4E0D\u8BE5\u542C\u9B54\u7406\u6C99\u7684\u6765\u53C2\u8D5B\u2026\u2026"
MusicName: ReimuNorway
- ForceId: 5
CivId: 5
CivName: "\u82F1\u683C\u5170"
@ -155,6 +160,7 @@ MonoBehaviour:
- "\u6211\u4F1A\u4ECE\u5934\u6765\u8FC7\u3002"
- "\u6B63\u56E0\u5931\u8D25\uFF0C\u624D\u9700\u7EE7\u7EED\u4FEE\u884C\u3002"
- "\u539F\u6765\u8FD9\u5C31\u662F\u2026\u2026\u51E1\u5FC3\u672A\u51C0\u7684\u4EE3\u4EF7\u3002"
MusicName: ByakurenBritish
- ForceId: 6
CivId: 6
CivName: "\u6CE2\u65AF"
@ -178,6 +184,7 @@ MonoBehaviour:
- "\u5076\u5C14\u8F93\u4E00\u5C40\uFF0C\u4E5F\u633A\u65B0\u9C9C\u3002"
- "\u8FD9\u662F\u6211\u9884\u89C1\u7684\u8D25\u5C40\u3002"
- "\u5931\u8D25\uFF0C\u4E0D\u8FC7\u662F\u9759\u97F3\u7247\u523B\u3002"
MusicName: MikoPersian
- ForceId: 7
CivId: 7
CivName: "\u62DC\u5360\u5EAD"
@ -201,6 +208,7 @@ MonoBehaviour:
- "\u2026\u2026\u8001\u8EAB\u5C0F\u77A7\u4F60\u4E86\u3002"
- "\u4E0D\u6789\u6B64\u6218\uFF0C\u6765\u65E5\u5B9A\u8BA8\u56DE\u6765\u3002"
- "\u4E5F\u7F62\u2026\u2026"
MusicName:
CivLandformList:
- civ: 0
LandformParamList:

1033
Unity/Assets/Resources/Export/Multilingual.asset
View File

File diff suppressed because one or more lines are too long

8
Unity/Assets/Resources/Export/PlayerDataAssets.asset
View File

@ -35,6 +35,7 @@ MonoBehaviour:
- 2218
LoseChatBubble:
- 923
MusicName: RemiliaEgyptian
- ForceId: 1
CivId: 1
CivName: 182
@ -60,6 +61,7 @@ MonoBehaviour:
- 1285
- 929
- 1286
MusicName: KaguyaFrench
- ForceId: 2
CivId: 2
CivName: 1636
@ -88,6 +90,7 @@ MonoBehaviour:
- 942
- 943
- 944
MusicName: KanakoGermany
- ForceId: 3
CivId: 3
CivName: 1638
@ -108,6 +111,7 @@ MonoBehaviour:
LoseChatBubble:
- 1288
- 949
MusicName: SatoriIndian
- ForceId: 4
CivId: 4
CivName: 2392
@ -129,6 +133,7 @@ MonoBehaviour:
- 953
- 1297
- 1298
MusicName: ReimuNorway
- ForceId: 5
CivId: 5
CivName: 1642
@ -155,6 +160,7 @@ MonoBehaviour:
- 964
- 965
- 966
MusicName: ByakurenBritish
- ForceId: 6
CivId: 6
CivName: 1644
@ -178,6 +184,7 @@ MonoBehaviour:
- 1294
- 973
- 974
MusicName: MikoPersian
- ForceId: 7
CivId: 7
CivName: 1646
@ -201,6 +208,7 @@ MonoBehaviour:
- 980
- 981
- 982
MusicName:
CivLandformList:
- civ: 0
LandformParamList:

3
Unity/Assets/Scripts/TH1_Audio/AudioManager.cs
View File

@ -52,6 +52,9 @@ namespace Logic.Audio
path["SatoriIndian"] = "Audio/SatoriIndian";
path["KanakoGermany"] = "Audio/KanakoGermany";
path["KaguyaFrench"] = "Audio/KaguyaFrench";
path["ReimuNorway"] = "Audio/ReimuNorway";
path["ByakurenBritish"] = "Audio/ByakurenBritish";
path["MikoPersian"] = "Audio/MikoPersian";
path["SFX/UI_buttonHover"] = "Audio/SFX/UI_buttonHover";
path["SFX/UI_buttonClick"] = "Audio/SFX/UI_buttonClick";
path["SFX/UNIT_click"] = "Audio/SFX/UNIT_click";

2
Unity/Assets/Scripts/TH1_DataAssetsScript/PlayerDataAssets.cs
View File

@ -190,6 +190,8 @@ public class PlayerInfo
public List<string> MeetChatBubble;
[MultilingualField]
public List<string> LoseChatBubble;
public string MusicName;
PlayerInfo()
{
foreach (TechType t in System.Enum.GetValues(typeof(TechType)))

2
Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs
View File

@ -1188,7 +1188,7 @@ namespace Logic.Action
// 1. 锁定玩家输入
//main.InputLogic.LockInput();
// 2. 创建临时探索者图像，3秒后自动销毁
// 2. 创建探索者，然后一边处理逻辑一边处理视觉，这里暂时用了maprenderer 来负责
MapRenderer.Instance.CreateTemporaryExplorer(actionParams.MapData,gridData, 3f);
actionParams.CityData.SetCityRenderer(actionParams.MapData);

6
Unity/Assets/Scripts/TH1_UI/ChooseUI.cs
View File

@ -220,7 +220,7 @@ public class ChooseUI
public void Show()
{
if (_isShowing || _isAnimating) return;
AudioManager.Instance.PlayMusic("RemiliaEgyptian",0.3f,0.3f,true);
AudioManager.Instance.PlayMusic("RemiliaEgyptian",1f,1f,true);
//设置默认点开的
_currentPanelIndex = 0;
@ -298,9 +298,9 @@ public class ChooseUI
}
if(index == 0)
AudioManager.Instance.PlayMusic("RemiliaEgyptian",0.3f,0.3f,true);
AudioManager.Instance.PlayMusic("RemiliaEgyptian",1f,1f,true);
else if(index == 1)
AudioManager.Instance.PlayMusic("KaguyaFrench",0.3f,0.3f,true);
AudioManager.Instance.PlayMusic("KaguyaFrench",1f,1f,true);
var anim = targetPanel.GetComponent<AnimancerComponent>();
if(anim != null)

1
Unity/Assets/Scripts/TH1_UI/Controller/Announce/UIAnnounceDiplomacyController.cs
View File

@ -62,7 +62,6 @@ namespace TH1_UI.Controller.Announce
}
}
void _OnBtnCloseClick()
{
Close();

8
Unity/Assets/Scripts/TH1_UI/Controller/Announce/UIAnnounceMajorEventController.cs
View File

@ -61,8 +61,12 @@ namespace TH1_UI.Controller.Announce
}
}
}
public override bool Close()
{
WindowScript.CloseView();
return base.Close();
}
void _OnBtnCloseClick()
{
Close();

6
Unity/Assets/Scripts/TH1_UI/Controller/Info/UIInfoDiplomacyController.cs
View File

@ -59,6 +59,12 @@ namespace TH1_UI.Controller.Info
}
}
}
public override bool Close()
{
WindowScript.CloseView();
return base.Close();
}
void _OnBtnCloseClick()

9
Unity/Assets/Scripts/TH1_UI/Controller/Info/UIInfoHeroController.cs
View File

@ -64,8 +64,13 @@ namespace TH1_UI.Controller.Info
}
}
}
public override bool Close()
{
WindowScript.CloseView();
return base.Close();
}
void _OnBtnCloseClick()
{
Close();

4
Unity/Assets/Scripts/TH1_UI/TechTreeUI.cs
View File

@ -621,8 +621,8 @@ public class TechTreeUI
animancer.Play(animationB); // 直接播放动画B
//播放音乐
var civ = Main.MapData.PlayerMap.SelfPlayerData.PlayerCivId;
if(civ == 0)AudioManager.Instance.PlayMusic("RemiliaEgyptian", 1f, 0.3f, true);
if(civ == 1)AudioManager.Instance.PlayMusic("KaguyaFrench",0.3f,0.3f,true);
if(civ == 0)AudioManager.Instance.PlayMusic("RemiliaEgyptian", 1f, 2f, true);
if(civ == 1)AudioManager.Instance.PlayMusic("KaguyaFrench",1f,2f,true);
}
private void PlayAnimTechTreeHide()
{

13
Unity/Assets/Scripts/TH1_UI/View/Announce/UIAnnounceMajorEventView.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Logic;
using Logic.Audio;
using Logic.CrashSight;
using Logic.Multilingual;
using RuntimeData;
@ -65,6 +66,9 @@ namespace TH1_UI.View.Announce
var txt = ChatBubble.Find("Text")?.GetComponent<TextMeshProUGUI>();
MultilingualManager.Instance.SetUIText(txt,playerInfo.GetRandomStartChat());
}
//step #4 播放音乐
AudioManager.Instance.PlayMusic(playerInfo.MusicName,1f,2f,true);
break;
case UIAnnounceMajorEventType.FirstMeet:
@ -93,6 +97,10 @@ namespace TH1_UI.View.Announce
MultilingualManager.Instance.SetUIText(txt,playerInfo.GetRandomMeetChat());
}
//step #4 播放音乐
AudioManager.Instance.PlayMusic(playerInfo.MusicName,1f,2f,true);
break;
case UIAnnounceMajorEventType.CivLose:
@ -153,6 +161,11 @@ namespace TH1_UI.View.Announce
return true;
}
public void CloseView()
{
AudioManager.Instance.StopMusic();
}
}
}

8
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using Logic;
using Logic.Action;
using Logic.Audio;
using Logic.CrashSight;
using Logic.Multilingual;
using RuntimeData;
@ -262,8 +263,15 @@ namespace TH1_UI.View.Info
OtherRelationAvatarList[rk].gameObject.SetActive(false);
}
//Step #6 设置BGM
AudioManager.Instance.PlayMusic(info.MusicName,1f,2f,true);
}
public void CloseView()
{
AudioManager.Instance.StopMusic();
}
}
}

12
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoHeroView.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Logic.Action;
using Logic.Audio;
using Logic.Multilingual;
using TH1_Core.Managers;
using TH1_Logic.Action;
@ -109,7 +110,11 @@ namespace TH1_UI.View.Info
//Step #2 设置出战框
SetPickedList();
//Step #3 处理音乐
if (Table.Instance.PlayerDataAssets.GetPlayerInfo(Main.MapData.PlayerMap.SelfPlayerData, out var info))
{
AudioManager.Instance.PlayMusic(info.MusicName, 1f, 2f, true);
}
}
@ -191,6 +196,11 @@ namespace TH1_UI.View.Info
UIManager.Instance.BottomBarUI.UpdateHeroButtonSprite();
//SetContent();
}
public void CloseView()
{
AudioManager.Instance.StopMusic();
}
}
}