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-04-23 14:56:24 +08:00
parent 319ee90b7e
commit 63f7d352c3
7 changed files with 235 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Render/Renderer2Dtest.asset
+13 -9
View File
@@ -513,15 +513,19 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
_filter:
- 0.007228916
- 0.043749984
- 0.12409639
- 0.20444278
- 0.24096388
- 0.20444278
- 0.12409639
- 0.043749984
- 0.007228916
- 0.0048309183
- 0.016401261
- 0.04532712
- 0.08293076
- 0.12053438
- 0.14946026
- 0.1610306
- 0.14946026
- 0.12053438
- 0.08293076
- 0.04532712
- 0.016401261
- 0.0048309183
--- !u!114 &-6086986437317696584
MonoBehaviour:
m_ObjectHideFlags: 3
Assets/Scenes/Persistence.unity
+203 -8
View File
@@ -4570,7 +4570,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -593.00165}
m_AnchoredPosition: {x: 960.00006, y: -909.66833}
m_SizeDelta: {x: 1000, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &296256892
@@ -5188,6 +5188,7 @@ RectTransform:
- {fileID: 1213015360}
- {fileID: 2130174137}
- {fileID: 2038665816}
- {fileID: 1024689438}
m_Father: {fileID: 2091451641}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -5454,7 +5455,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -359.005}
m_AnchoredPosition: {x: 960.00006, y: -549.005}
m_SizeDelta: {x: 400, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &430924360
@@ -12071,6 +12072,200 @@ MonoBehaviour:
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: ad0f3efe82f2af84bb755dca3a016309, type: 2}
--- !u!1 &1024689437
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1024689438}
- component: {fileID: 1024689442}
- component: {fileID: 1024689441}
- component: {fileID: 1024689440}
- component: {fileID: 1024689439}
m_Layer: 5
m_Name: Return
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1024689438
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024689437}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 398552835}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -667, y: 480.7}
m_SizeDelta: {x: 56.01, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1024689439
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024689437}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &1024689440
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024689437}
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.5188679, g: 0.5188679, b: 0.5188679, a: 1}
m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1}
m_DisabledColor: {r: 0.5176471, g: 0.5176471, b: 0.5176471, a: 0.5176471}
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: 1024689441}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1024689441
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024689437}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u8FD4\u56DE\n"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1024689442
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024689437}
m_CullTransparentMesh: 1
--- !u!1 &1039398627
GameObject:
m_ObjectHideFlags: 3
@@ -12321,7 +12516,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -141.00333}
m_AnchoredPosition: {x: 960.00006, y: -204.33667}
m_SizeDelta: {x: 89.61, y: 48.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1076103036
@@ -15752,10 +15947,10 @@ RectTransform:
- {fileID: 296256891}
m_Father: {fileID: 2091451641}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1000, y: 700}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1340005159
MonoBehaviour:
@@ -24471,12 +24666,12 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2135943277}
- {fileID: 300534481}
- {fileID: 2135943277}
- {fileID: 1867622714}
- {fileID: 1216017968}
- {fileID: 398552835}
- {fileID: 1340005158}
- {fileID: 1867622714}
m_Father: {fileID: 1110722291}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
Assets/Scripts/Game Loop/SettingLoader.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace AibisDream
/// </summary>
public class SettingLoader
{
private static readonly string SettingPath = Application.streamingAssetsPath + "/Config/sprite_group.json";
private static readonly string SettingPath = Application.streamingAssetsPath + "/Config/setting.json";
private readonly ConfigContainer _container;
Assets/Scripts/UI/Panel/MainPanel.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace AibisDream
private void QuickForward()
{
DialogController.Instance.quickRunMode = !DialogController.Instance.quickRunMode;
}
private void OpenSettingPanel()
Assets/Scripts/UI/Panel/RecordPanel.cs
+13
View File
@@ -1,6 +1,7 @@
using System.Text;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace AibisDream
{
@@ -13,14 +14,21 @@ namespace AibisDream
public void Show()
{
ShowText();
GameManager.Instance.PauseGame();
gameObject.SetActive(true);
var btn = transform.Find("Return").GetComponent<Button>();
btn.onClick.AddListener(ReturnGame);
}
public void Hide()
{
gameObject.SetActive(false);
GameManager.Instance.ContinueGame();
// 关闭时停止渲染
ClearText();
var btn = transform.Find("Return").GetComponent<Button>();
btn.onClick.RemoveAllListeners();
}
private void ShowText()
@@ -34,5 +42,10 @@ namespace AibisDream
var text = transform.Find("Log View").GetComponentInChildren<TMP_Text>();
text.text = null;
}
private void ReturnGame()
{
UIManager.Instance.HidePanel<RecordPanel>();
}
}
}
Assets/StreamingAssets/Config/setting.json
+3
View File
@@ -0,0 +1,3 @@
{
"Volume": 0.5
}
Assets/StreamingAssets/Config/sprite_group.json
+1 -3
View File
@@ -1110,7 +1110,5 @@
"默认姿势石头"
]
}
},
"MainVolume": "0.59",
"Volume": "0.43"
}
}