Merge branch 'feature/dialog-option' into develop

This commit is contained in:
2024-08-13 02:32:05 +08:00
22 changed files with 836 additions and 99 deletions
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 201339454033674448f997737049ce0e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,12 @@
{
"projectFileVersion": 2,
"sourceFiles": [
"*.yarn"
],
"excludeFiles": [
"**/*~/*"
],
"localisation": {},
"baseLanguage": "zh-CHS",
"compilerOptions": {}
}
@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 8fe94dc39a250ca4f9cd937647ab4893
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3}
useAddressableAssets: 0
UseUnityLocalisationSystem: 0
unityLocalisationStringTableCollection: {instanceID: 0}
@@ -0,0 +1,15 @@
title: Start
---
我: 这是选项测试文件 #line:069537f
我: 点击不同按钮可以执行不同命令 #line:00147c3
<<load_scene OptionTestScene>>
我: 加载测试场景 #line:0a67910
我: 提供两个按钮进行点击 #line:0cb2011
[command name=show_buttons /] #line:006eeaa
-> 按钮1 #line:0db0f08
我: 按下了按钮1 #line:0d84460
-> 按钮2 #line:0556913
我: 按下了按钮2 #line:0b552f4
我: 测试完成 #line:011c95f
===
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4643db09184d54d4f9c0c69236d3c501
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
+347
View File
@@ -0,0 +1,347 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &506231561
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 506231565}
- component: {fileID: 506231564}
- component: {fileID: 506231563}
- component: {fileID: 506231562}
- component: {fileID: 506231566}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &506231562
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506231561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &506231563
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506231561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &506231564
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506231561}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: -1
m_TargetDisplay: 0
--- !u!224 &506231565
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506231561}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 693116407}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &506231566
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506231561}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5897053db6d09014c809a2f20396e2ab, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &693116406
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 693116407}
- component: {fileID: 693116410}
- component: {fileID: 693116409}
- component: {fileID: 693116408}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &693116407
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693116406}
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: 506231565}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &693116408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693116406}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 1
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &693116409
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693116406}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &693116410
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693116406}
m_CullTransparentMesh: 1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 506231565}
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f9668465fd9c51748b8c47d8adb80210
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+58 -61
View File
@@ -155,8 +155,8 @@ Transform:
m_Children:
- {fileID: 1584263514}
- {fileID: 973075153}
- {fileID: 525522645}
- {fileID: 1936621685}
- {fileID: 494300779}
m_Father: {fileID: 1009826577}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &72512887
@@ -204,9 +204,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -54.599014}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &237392156
@@ -462,6 +462,50 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c926f9749bfa894eaaff47ec3a43a64, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &494300778
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 494300779}
- component: {fileID: 494300780}
m_Layer: 0
m_Name: Command Option View
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &494300779
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494300778}
serializedVersion: 2
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: 72512886}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &494300780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494300778}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e61040b961ba1446ad453ee17f4a737, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -599,55 +643,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &525522644
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 525522645}
- component: {fileID: 525522646}
m_Layer: 0
m_Name: Advance Input
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &525522645
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 525522644}
serializedVersion: 2
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: 72512886}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &525522646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 525522644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 097b95c9f69f04f2d8c08a817e7786af, type: 3}
m_Name:
m_EditorClassIdentifier:
dialogueView: {fileID: 1584263515}
continueActionType: 1
continueActionKeyCode: 32
continueActionButtonName: Jump
continueActionOnButtonRelease: 0
--- !u!1 &619394800
GameObject:
m_ObjectHideFlags: 0
@@ -1162,10 +1157,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 18a3ec3914131d44199ae33902edf159, type: 3}
m_Name:
m_EditorClassIdentifier:
runMode: 1
firstTalkSO: {fileID: 11400000, guid: 2cc7ecb3ca3ad4f418430e814a7d1dc5, type: 2}
clinicScene: ClinicScene
runMode: 1
testScene:
testYarnProject: OptionTest
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -1930,9 +1925,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -163.79704}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1596715192
@@ -2224,9 +2219,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1696845842}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: -272.99506}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611684201
@@ -2632,6 +2627,8 @@ MonoBehaviour:
_variableStorage: {fileID: 667130563}
dialogueViews:
- {fileID: 1584263515}
- {fileID: 973075154}
- {fileID: 494300780}
startNode: Start
startAutomatically: 0
runSelectedOptionAsLine: 0
@@ -0,0 +1,64 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Yarn.Markup;
using Yarn.Unity;
namespace AibisDream
{
public class CommandOptionView : DialogueViewBase
{
// 进入指令选项模式
private bool isInCommand;
private string commandName;
public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
{
// 判断是否进入Command状态
isInCommand = dialogueLine.Text.TryGetCommandAttr(out var name);
if (isInCommand)
{
// 保存指令
commandName = name;
// 进入下一步
onDialogueLineFinished.Invoke();
}
else
{
base.RunLine(dialogueLine, onDialogueLineFinished);
}
}
public override void RunOptions(DialogueOption[] dialogueOptions, Action<int> onOptionSelected)
{
// 非指令直接跳过
if (!isInCommand)
{
base.RunOptions(dialogueOptions, onOptionSelected);
return;
}
// 传输选项
YarnOption[] options = YarnOption.GeneOptions(dialogueOptions, onOptionSelected);
DialogController.Instance.InvokeOptionCommand(commandName, options);
commandName = null;
}
public override void InterruptLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
{
base.InterruptLine(dialogueLine, onDialogueLineFinished);
}
public override void DismissLine(Action onDismissalComplete)
{
base.DismissLine(onDismissalComplete);
}
public override void UserRequestedViewAdvancement()
{
base.UserRequestedViewAdvancement();
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4e61040b961ba1446ad453ee17f4a737
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -11,6 +12,8 @@ namespace AibisDream
{
private DialogueRunner dialogueRunner;
private Dictionary<string, Action<YarnOption[]>> commandMap = new Dictionary<string, Action<YarnOption[]>>();
private void Start()
{
dialogueRunner = GetComponentInChildren<DialogueRunner>();
@@ -26,6 +29,55 @@ namespace AibisDream
dialogueRunner.StartDialogue("Start");
}
/// <summary>
/// 执行指令
/// </summary>
/// <param name="commandName">指令名称</param>
public void InvokeOptionCommand(string commandName, YarnOption[] options)
{
if (commandName == null) { }
if (commandMap.TryGetValue(commandName, out var action))
{
action(options);
}
else
{
Debug.LogWarning($"没有找到 {commandName} 命令");
}
}
/// <summary>
/// 注册带选项指令
/// </summary>
/// <param name="commandName">指令名称</param>
/// <param name="commandAction">指令函数</param>
public void RegisterOptionCommand(string commandName, Action<YarnOption[]> commandAction)
{
if (commandMap.ContainsKey(commandName))
{
Debug.Log($"命令 {commandName} 并未注册,重新注册会替换旧指令");
}
commandMap[commandName] = commandAction;
}
/// <summary>
/// 卸载指令
/// </summary>
/// <param name="commandName">指令名称</param>
public void RemoveOptionCommand(string commandName)
{
if (commandMap.ContainsKey(commandName))
{
commandMap.Remove(commandName);
}
else
{
Debug.Log($"命令 {commandName} 并未注册,重新注册会替换旧指令");
}
}
#region
[YarnCommand("switch_tv")]
public static void SwitchTV(string picName)
+21 -1
View File
@@ -8,13 +8,33 @@ namespace AibisDream
{
public class LineView : DialogueViewBase
{
// ½øÈëÖ¸ÁîÑ¡Ïîģʽ
private bool isInCommand;
public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
{
DialogUiViewer.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text, dialogueLine.CharacterName, onDialogueLineFinished);
isInCommand = dialogueLine.Text.HasCommandAttr();
if (isInCommand)
{
DialogUiViewer.Instance.HideDialog();
base.RunLine(dialogueLine, onDialogueLineFinished);
return;
}
DialogUiViewer.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text,
dialogueLine.CharacterName, onDialogueLineFinished);
}
public override void RunOptions(DialogueOption[] dialogueOptions, Action<int> onOptionSelected)
{
if (isInCommand)
{
DialogUiViewer.Instance.HideDialog();
base.RunOptions(dialogueOptions, onOptionSelected);
return;
}
DialogUiViewer.Instance.ShowOptions(dialogueOptions, onOptionSelected);
}
@@ -0,0 +1,63 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Yarn.Unity;
namespace AibisDream
{
public class YarnOption
{
private DialogueOption dialogueOption;
private Action<int> onOptionSelected;
public YarnOption(DialogueOption dialogueOption, Action<int> onOptionSelected)
{
this.dialogueOption = dialogueOption;
this.onOptionSelected = onOptionSelected;
}
public string Text
{
get
{
return dialogueOption.Line.TextWithoutCharacterName.Text;
}
}
/// <summary>
/// 选择该选项
/// </summary>
public void SelectOption()
{
if (onOptionSelected == null)
{
Debug.LogWarning($"选项 {Text} 已经执行过了");
}
else
{
onOptionSelected.Invoke(dialogueOption.DialogueOptionID);
onOptionSelected = null;
}
}
/// <summary>
/// 生成选项
/// </summary>
/// <param name="options">原始选项</param>
/// <param name="onOptionSelected">选择</param>
/// <returns>包装选项</returns>
public static YarnOption[] GeneOptions(DialogueOption[] options, Action<int> onOptionSelected)
{
YarnOption[] yarnOptions = new YarnOption[options.Length];
for (int i = 0; i < options.Length; i++)
{
yarnOptions[i] = new YarnOption(options[i], onOptionSelected);
}
return yarnOptions;
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 19f7a96d35f4ad54ea493eb8c65ab6f0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+22 -22
View File
@@ -4,12 +4,17 @@ using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.Rendering;
using Yarn.Unity;
namespace AibisDream
{
public class GameLoopManager : Singleton<GameLoopManager>
{
[Header("һԻ")]
[Header("运行模式")]
[SerializeField]
private RunMode runMode;
[Header("正式环境参数")]
[SerializeField] private TalkSceneSO firstTalkSO;
private TalkSceneSO currentTalkSceneSO;
@@ -17,29 +22,16 @@ namespace AibisDream
[SerializeField]
private string clinicScene;
[SerializeField]
private RunMode runMode;
[Header("测试环境参数")]
[SerializeField] private string testYarnProject;
[SerializeField]
private string testScene;
private void Start()
public void Start()
{
if (runMode == RunMode.Pro)
if (runMode == RunMode.Test)
{
//
GameObject UI = GameObject.Find("UI");
UI.SetActive(true);
}
else if (runMode == RunMode.Test)
{
if (testScene == null)
{
Debug.Log("Գ");
}
//
SceneLoader.Instance.LoadScene(testScene);
GameObject gameObject = GameObject.Find("UI");
gameObject.transform.Find("Main Canvas").gameObject.SetActive(false);
StartTestGame();
}
}
@@ -56,11 +48,19 @@ namespace AibisDream
StartMenuViewer.Instance.HideStartMenu();
DialogController.Instance.StartDialog(currentTalkSceneSO.yarnProject);
}
public void StartTestGame()
{
SceneLoader.Instance.LoadScene(clinicScene);
var proj = Resources.Load<YarnProject>($"Yarn/{testYarnProject}/{testYarnProject}");
Debug.Log(proj == null);
DialogController.Instance.StartDialog(proj);
}
}
public enum RunMode
{
Test, Pro
Test, Pro, FixTest
}
}
+5 -3
View File
@@ -10,12 +10,14 @@ namespace AibisDream
[SerializeField]
public GearModel data;
public GearModel Data {
public GearModel Data
{
get { return data; }
set {
set
{
data = value;
InitGearModel(data);
}
}
}
private GearController gearController;
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 999ff60e53f68cc42b783630507e7781
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+41
View File
@@ -0,0 +1,41 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace AibisDream.Test
{
public class OptionTest : MonoBehaviour
{
private GameObject panel;
private GameObject prefab;
void Start()
{
DialogController.Instance.RegisterOptionCommand("show_buttons", ShowButtons);
panel = transform.GetChild(0).gameObject;
prefab = Resources.Load<GameObject>("Perfabs/UI/Choice Button");
}
public void ShowButtons(YarnOption[] options)
{
foreach (YarnOption option in options)
{
var instance = Instantiate(prefab);
instance.transform.SetParent(panel.transform);
instance.GetComponentInChildren<TextMeshProUGUI>().text = option.Text;
instance.GetComponent<Button>().onClick.AddListener(() => {
option.SelectOption();
panel.SetActive(false);
});
}
}
public void OnDestroy()
{
DialogController.Instance.RemoveOptionCommand("show_buttons");
}
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5897053db6d09014c809a2f20396e2ab
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+20 -12
View File
@@ -1,4 +1,4 @@
using Febucci.UI;
using Febucci.UI;
using Febucci.UI.Core;
using System;
using System.Collections;
@@ -12,7 +12,7 @@ namespace AibisDream
{
public class DialogUiViewer : Singleton<DialogUiViewer>
{
#region UI
#region UI
private GameObject dialogBox;
private TypewriterByCharacter dialogText;
private TextMeshProUGUI actorName;
@@ -21,21 +21,23 @@ namespace AibisDream
private GameObject choiceButtonPrefab;
#endregion
private void Start()
protected override void Awake()
{
// 获取预制体
base.Awake();
// 获取预制体
choiceButtonPrefab = Resources.Load<GameObject>("Perfabs/UI/Choice Button");
// 获取子物体
// 获取子物体
dialogBox = transform.GetChild(0).gameObject;
Debug.Log(dialogBox == null);
GetDialogComponentInBox(dialogBox);
}
/// <summary>
/// 显示文字
/// 显示文字
/// </summary>
/// <param name="dialogLine">对话内容</param>
/// <param name="actor">名称</param>
/// <param name="nextStep">下一步</param>
/// <param name="dialogLine">对话内容</param>
/// <param name="actor">名称</param>
/// <param name="nextStep">下一步</param>
public void ShowLine(string dialogLine, string actor, Action nextStep)
{
dialogBox.SetActive(true);
@@ -46,16 +48,15 @@ namespace AibisDream
dialogText.ShowText(dialogLine);
nextButton.onClick.RemoveAllListeners();
nextButton.onClick.AddListener(() => {
Debug.Log("Next");
nextStep.Invoke();
nextButton.gameObject.SetActive(false);
});
}
/// <summary>
/// 显示选项
/// 显示选项
/// </summary>
/// <param name="dialogueOptions">选项</param>
/// <param name="dialogueOptions">选项</param>
/// <param name="onOptionSelected"></param>
public void ShowOptions(DialogueOption[] dialogueOptions, Action<int> onOptionSelected)
{
@@ -63,6 +64,13 @@ namespace AibisDream
choiceBox.SetActive(true);
dialogText.gameObject.SetActive(false);
// 销毁原来的按钮
foreach (Transform child in choiceBox.transform)
{
Destroy(child.gameObject);
}
// 生成新按钮
foreach (DialogueOption option in dialogueOptions)
{
var choiceInstance = Instantiate(choiceButtonPrefab, Vector3.zero, Quaternion.identity);
+26
View File
@@ -0,0 +1,26 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Yarn.Markup;
namespace AibisDream
{
public static class YarnUtil
{
private const string COMMAND_ATTR = "command";
private const string COMMAND_PROP = "name";
public static bool HasCommandAttr(this MarkupParseResult text)
{
return text.TryGetAttributeWithName(COMMAND_ATTR, out var attribute);
}
public static bool TryGetCommandAttr(this MarkupParseResult text, out string commandName)
{
bool res = text.TryGetAttributeWithName(COMMAND_ATTR, out var attribute);
commandName = res ? attribute.Properties[COMMAND_PROP].StringValue : null;
return res;
}
}
}
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cf7e48d25bd13f54f896d6eab32f0b9b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: