tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题修改

Browse Source
This commit is contained in:
dingyuntian
2025-12-23 20:28:17 +08:00
parent d27350121b
commit 522a49bdc6
22 changed files with 1263 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/link.xml.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5d3996fd36180b946afca2fae36c4121
guid: 53058fb900d71f24f8c7402f538ecae1
TextScriptImporter:
externalObjects: {}
userData:
Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset
+957 -936
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/FP_Prologue/FP_Prologue_en.asset
+5 -1
View File
@@ -478,7 +478,7 @@ MonoBehaviour:
m_Localized: 'Linking: Establishing connection...'
m_Metadata:
m_Items: []
- m_Id: 1151122466148462
- m_Id: 71035092779143168
m_Localized: 'SpeakerModule: Connection established with Expression Module!'
m_Metadata:
m_Items: []
@@ -660,6 +660,10 @@ MonoBehaviour:
m_Localized:
m_Metadata:
m_Items: []
- m_Id: 71038673238364160
m_Localized: 'Linking: Establishing connection...'
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/Dialog/FP_Prologue/FP_Prologue_ja-JP.asset
+5 -1
View File
@@ -454,7 +454,7 @@ MonoBehaviour:
m_Localized: "Linking: \u63A5\u7D9A\u4E2D\u2026"
m_Metadata:
m_Items: []
- m_Id: 1151122466148462
- m_Id: 71035092779143168
m_Localized: "SpeakerModule: \u8868\u73FE\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u306E\u63A5\u7D9A\u3092\u78BA\u7ACB\u3057\u307E\u3057\u305F\uFF01"
m_Metadata:
m_Items: []
@@ -634,6 +634,10 @@ MonoBehaviour:
m_Localized: "\u30AA\u30D7\u30B7\u30E7\u30F32"
m_Metadata:
m_Items: []
- m_Id: 71038673238364160
m_Localized: "Linking: \u63A5\u7D9A\u4E2D\u2026"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset
+9 -1
View File
@@ -30,7 +30,7 @@ MonoBehaviour:
m_Localized: "Error: \u68C0\u6D4B\u5230\u6E83\u89E3\u4FE1\u53F7\u6D41\uFF01\u8FDB\u5165\u9694\u79BB\u6A21\u5F0F\u2026"
m_Metadata:
m_Items: []
- m_Id: 1151122466148462
- m_Id: 71035092779143168
m_Localized: "SpeakerModule: \u5DF2\u4E0E\u8868\u8FBE\u6A21\u5757\u5EFA\u7ACB\u8FDE\u63A5\uFF01"
m_Metadata:
m_Items: []
@@ -634,6 +634,14 @@ MonoBehaviour:
m_Localized: "\u9009\u98792"
m_Metadata:
m_Items: []
- m_Id: 71038673238364161
m_Localized: "Linking: \u6D4B\u8BD5\u6587\u672C"
m_Metadata:
m_Items: []
- m_Id: 71038673238364160
m_Localized: "Linking: \u6B63\u5728\u5EFA\u7ACB\u8FDE\u63A5\u2026"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Plugins/Android/gradleTemplate.properties
+8
View File
@@ -0,0 +1,8 @@
org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
org.gradle.parallel=true
unityStreamingAssets=**STREAMING_ASSETS**
# Android Resolver Properties Start
android.useAndroidX=true
android.enableJetifier=true
# Android Resolver Properties End
**ADDITIONAL_PROPERTIES**
Assets/Plugins/Android/gradleTemplate.properties.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4bd35721b7d123842aafa0d29c01e831
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/mainTemplate.gradle
+41
View File
@@ -0,0 +1,41 @@
apply plugin: 'com.android.library'
**APPLY_PLUGINS**
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
**DEPS**}
android {
ndkPath "**NDKPATH**"
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
minSdkVersion **MINSDKVERSION**
targetSdkVersion **TARGETSDKVERSION**
ndk {
abiFilters **ABIFILTERS**
}
versionCode **VERSIONCODE**
versionName '**VERSIONNAME**'
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
}
lintOptions {
abortOnError false
}
aaptOptions {
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
}**PACKAGING_OPTIONS**
}
**IL_CPP_BUILD_SETUP**
**SOURCE_BUILD_SETUP**
**EXTERNAL_SOURCES**
Assets/Plugins/Android/mainTemplate.gradle.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 83d8f678dc6ffdc44af3506282c87090
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/settingsTemplate.gradle
+23
View File
@@ -0,0 +1,23 @@
pluginManagement {
repositories {
**ARTIFACTORYREPOSITORY**
gradlePluginPortal()
google()
mavenCentral()
}
}
include ':launcher', ':unityLibrary'
**INCLUDES**
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
repositories {
**ARTIFACTORYREPOSITORY**
google()
mavenCentral()
flatDir {
dirs "${project(':unityLibrary').projectDir}/libs"
}
}
}
Assets/Plugins/Android/settingsTemplate.gradle.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 664e1f7a8d968ff49a6e36f996232a89
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Yarn/FP_Prologue/EventNode.yarn
+1
View File
@@ -67,6 +67,7 @@ title: 拿起插头
// <<ModuleHightLight Emo true>>
// <<endif>>
===
title: ShockEffect
---
<<jump 电击后>>
Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn
+3 -3
View File
@@ -321,7 +321,7 @@ colorID: 8
group:插线检查
position: 1101,-2974
---
<<wait 0.1>>
<<wait 0.2>>
Linking: 正在建立连接… #line:0e63512
<<wait 0.2>>
LogicModule: 已与{$currentCheckModule}模块建立连接！ #line:08d3946
@@ -417,9 +417,9 @@ colorID: 8
group:插线检查
position: 542,-2965
---
<<wait 0.1>>
Linking: 正在建立连接… #line:095d856
<<wait 0.2>>
Linking: 正在建立连接… #line:095d856
<<wait 0.5>>
SpeakerModule: 已与表达模块建立连接！ #line:0995165
<<play_sfx "event:/Scriptal/beep_warning">>
Error: 检测到溃解信号流！进入隔离模式… #line:0382726
Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+10 -8
View File
@@ -88,16 +88,16 @@ namespace AibisDream.FixSystem
// 空格延长一点避免报错
if (string.IsNullOrWhiteSpace(token.lineInfo.lineText))
{
token.lineInfo.lineText = " ";
token.lineInfo.lineText = " ";
}
// 显示标题
ShowTitle(token.lineInfo.character.GetActorName());
// 显示文本
TypewriterCore textItemTypewriter = AddText(token.lineInfo.lineText);
textItemTypewriter.SetTypewriterSpeed(GetTextSpeedValue());
textItemTypewriter.onTextShowed.AddListener(() => OnTextShown(token, textItemTypewriter));
TypewriterCore textItemTypewriter = AddText(token);
token.TextStart();
// 强制更新布局
LayoutRebuilder.ForceRebuildLayoutImmediate(textRoot);
}
@@ -114,13 +114,13 @@ namespace AibisDream.FixSystem
syncToken.TextShown();
}
private TypewriterByCharacter AddText(string newLine)
private TypewriterByCharacter AddText(LineSyncToken token)
{
// 生成新文本组件
var textItem = Instantiate(_textItemPrefab, textRoot);
var textItemTypewriter = textItem.GetComponent<TypewriterByCharacter>();
// 估算文本高度
var newLineNum = EstimateLineNum(newLine);
var newLineNum = EstimateLineNum(token.lineInfo.lineText);
var oldLineNum = CalcTotalLineNum();
if (newLineNum + oldLineNum > maxLineNum)
{
@@ -128,8 +128,10 @@ namespace AibisDream.FixSystem
}
_lineQueue.Enqueue(textItemTypewriter);
// 播放文本
textItemTypewriter.ShowText(newLine);
textItemTypewriter.SetTypewriterSpeed(GetTextSpeedValue());
textItemTypewriter.onTextShowed.AddListener(() => OnTextShown(token, textItemTypewriter));
textItemTypewriter.ShowText(token.lineInfo.lineText);
return textItemTypewriter;
}
Assets/Scripts/Game Loop/GameManager.cs
+4 -3
View File
@@ -42,8 +42,6 @@ namespace AibisDream
// 场景So事件注册
_currentTalkSceneSo = new BindProperty<TalkSceneSO>();
_currentTalkSceneSo.Register(item => _data.curSceneSoName = item.name);
// 事件广播
EnumEventSystem.Global.Send(GameLoopEnum.AppStart);
// 加载SO
Addressables.LoadAssetsAsync<TalkSceneSO>("SceneSO", null).Completed += LoadTalkSo;
@@ -62,10 +60,12 @@ namespace AibisDream
.Callback(() => UIManager.Instance.GetPanel<PlayToolPanel>().FadeInSync(0))
.Coroutine(() => SceneLoader.Instance.LoadSceneAsync("ClinicOut"))
.Callback(() => UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutSync())
.Callback(() => EnumEventSystem.Global.Send(GameLoopEnum.AppStart))
.Start(this);
}
#else
SceneLoader.Instance.LoadScene("ClinicOut");
// 事件广播
SceneLoader.Instance.LoadScene("ClinicOut", () => EnumEventSystem.Global.Send(GameLoopEnum.AppStart));
runMode = RunMode.Product;
#endif
}
@@ -164,6 +164,7 @@ namespace AibisDream
private IEnumerator RestartCoroutine()
{
UIManager.Instance.GetPanel<PlayToolPanel>().FadeInSync(0.1f);
UIManager.Instance.HidePanel<MainPanel>();
// 清理所有系统注册
if (FixSystemCenter.SystemDic != null)
Assets/Scripts/Game Loop/SceneLoader.cs
+5 -3
View File
@@ -32,9 +32,9 @@ namespace AibisDream
/// 同步场景转换
/// </summary>
/// <param name="targetScene">目标场景</param>
public void LoadScene(string targetScene)
public void LoadScene(string targetScene, Action onComplete = null)
{
StartCoroutine(LoadSceneAsync(targetScene));
StartCoroutine(LoadSceneAsync(targetScene, onComplete));
}
/// <summary>
@@ -42,7 +42,7 @@ namespace AibisDream
/// </summary>
/// <param name="targetScene">目标场景</param>
/// <returns></returns>
public IEnumerator LoadSceneAsync(string targetScene)
public IEnumerator LoadSceneAsync(string targetScene, Action onComplete = null)
{
if (_isLoading)
{
@@ -79,6 +79,8 @@ namespace AibisDream
UIManager.Instance.GetPanel<InfoPanel>().HideLoading();
_isLoading = false;
onComplete?.Invoke();
}
}
Packages/manifest.json
+15
View File
@@ -3,6 +3,7 @@
"com.unity.addressables": "1.21.21",
"com.unity.cinemachine": "2.9.7",
"com.unity.collab-proxy": "2.0.5",
"com.unity.device-simulator.devices": "1.0.1",
"com.unity.feature.2d": "2.0.0",
"com.unity.ide.cursor": "https://github.com/boxqkrtm/com.unity.ide.cursor.git",
"com.unity.ide.rider": "3.0.24",
@@ -56,6 +57,20 @@
"scopes": [
"dev.yarnspinner"
]
},
{
"name": "package.openupm.com",
"url": "https://package.openupm.com",
"scopes": [
"com.google.external-dependency-manager"
]
},
{
"name": "NPMJS",
"url": "https://registry.npmjs.org/",
"scopes": [
"com.taptap"
]
}
]
}
Packages/packages-lock.json
+7
View File
@@ -143,6 +143,13 @@
},
"url": "https://packages.unity.cn"
},
"com.unity.device-simulator.devices": {
"version": "1.0.1",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
ProjectSettings/AndroidResolverDependencies.xml
+24
View File
@@ -0,0 +1,24 @@
<dependencies>
<packages>
<package>com.taptap.sdk:tap-core-unity:4.9.2</package>
<package>com.taptap.sdk:tap-login-unity:4.9.2</package>
</packages>
<files />
<settings>
<setting name="androidAbis" value="arm64-v8a" />
<setting name="bundleId" value="com.Tinbird.AllOurBrokenParts" />
<setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="True" />
<setting name="gradleTemplateEnabled" value="True" />
<setting name="installAndroidPackages" value="True" />
<setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
<setting name="packageDir" value="Assets/Plugins/Android" />
<setting name="patchAndroidManifest" value="True" />
<setting name="patchMainTemplateGradle" value="True" />
<setting name="projectExportEnabled" value="False" />
<setting name="useFullCustomMavenRepoPathWhenExport" value="True" />
<setting name="useFullCustomMavenRepoPathWhenNotExport" value="False" />
<setting name="useJetifier" value="True" />
</settings>
</dependencies>
ProjectSettings/GvhProjectSettings.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<projectSettings>
<projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="4780b02e60044d61b3d8f2314d3de6e2" />
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
</projectSettings>
ProjectSettings/PackageManagerSettings.asset
+19 -3
View File
@@ -34,11 +34,27 @@ MonoBehaviour:
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
m_UserSelectedRegistryName: OpenUPM
- m_Id: scoped:project:package.openupm.com
m_Name: package.openupm.com
m_Url: https://package.openupm.com
m_Scopes:
- com.google.external-dependency-manager
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
- m_Id: scoped:project:NPMJS
m_Name: NPMJS
m_Url: https://registry.npmjs.org
m_Scopes:
- com.taptap
m_IsDefault: 0
m_Capabilities: 0
m_ConfigSource: 4
m_UserSelectedRegistryName: NPMJS
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_Modified: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -838
m_OriginalInstanceId: -840
m_UserModificationsInstanceId: -834
m_OriginalInstanceId: -838
m_LoadAssets: 0
ProjectSettings/ProjectSettings.asset
+98 -1
View File
@@ -133,7 +133,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.3.3.28-20251222-184826
bundleVersion: 0.3.3.35-20251223-194152
preloadedAssets:
- {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2}
metroInputSource: 0
@@ -378,6 +378,103 @@ PlayerSettings:
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTarget: iPhone
m_Icons:
- m_Textures: []
m_Width: 180
m_Height: 180
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 167
m_Height: 167
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 152
m_Height: 152
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 76
m_Height: 76
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 87
m_Height: 87
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 60
m_Height: 60
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 20
m_Height: 20
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 1024
m_Height: 1024
m_Kind: 4
m_SubKind: App Store
m_BuildTargetBatching: []
m_BuildTargetShaderSettings: []
m_BuildTargetGraphicsJobs: []