Merge branch 'develop' into feature/stone-day2
This commit is contained in:
@@ -27,11 +27,6 @@ MonoBehaviour:
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: f9668465fd9c51748b8c47d8adb80210
|
||||
m_Address: OptionTestScene
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 4d21ec2ac5838f8499a884e9789bf588
|
||||
m_Address: "\u4F69\u4F69\u89C6\u89C9\u6A21\u5757"
|
||||
m_ReadOnly: 0
|
||||
|
||||
@@ -13,7 +13,7 @@ GameObject:
|
||||
- component: {fileID: 6048524599704252402}
|
||||
- component: {fileID: 207758920267391891}
|
||||
- component: {fileID: 653930043964180535}
|
||||
m_Layer: 8
|
||||
m_Layer: 0
|
||||
m_Name: Bottle
|
||||
m_TagString: Moveable
|
||||
m_Icon: {fileID: 0}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"projectFileVersion": 2,
|
||||
"sourceFiles": [
|
||||
"*.yarn"
|
||||
],
|
||||
"excludeFiles": [
|
||||
"**/*~/*"
|
||||
],
|
||||
"localisation": {},
|
||||
"baseLanguage": "zh-CHS",
|
||||
"compilerOptions": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 710c7d6905637e84580697a989567180
|
||||
ScriptedImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3}
|
||||
useAddressableAssets: 0
|
||||
UseUnityLocalisationSystem: 0
|
||||
unityLocalisationStringTableCollection: {instanceID: 0}
|
||||
@@ -1,52 +0,0 @@
|
||||
title: Start
|
||||
position: -118,-175
|
||||
---
|
||||
<<switch_tv 新闻>>
|
||||
TV: 大家好，这里是幸福罐头产业园区，下面是今天的园区新闻： #line:0918e0d
|
||||
TV: 销售大赛是园区一年一度的盛举，旨在通过销售，促进幸福罐头公司员工进一步提高生产、销售效率，扩大产业规模。 #line:05de3d2
|
||||
TV: 我宣布，幸福罐头产业园区第1011届销售大赛正式开幕！ #line:0add1f9
|
||||
-> 这是选项1
|
||||
<<indoor>>
|
||||
<<jump SelfTalk>>
|
||||
-> 这是选项2
|
||||
<<jump StartFix>>
|
||||
===
|
||||
|
||||
title: SelfTalk
|
||||
position: -120,50
|
||||
---
|
||||
我: 我叫杰克，是一名医生，也是幸福罐头产业园区的员工； #line:01a2bd9
|
||||
我: 我的工作是给公司里所有部门的员工看病，直到被公司回收。 #line:0bf02cc
|
||||
我: 就像数据库里的一句很久以前的人类老话——“铁饭碗” ！ #line:0604666
|
||||
我: 虽然我们这些机器人，从来没见过幸福镇以外的世界，更不用说人类了。 #line:029bb37
|
||||
<<character_into Express_3>>
|
||||
？？？:你好~亲爱的医生~这里是我们园区的员工诊所吗？ #line:02706de
|
||||
我: 没错，咱公司什么时候有歌唱家了？ #line:0cfb2a2
|
||||
？？？: 我不是~歌唱家~只是公司滴送货员~石头~ #line:0d4ca28
|
||||
石头: 公司举办~销售大赛~很多罐头~需要我送~忙碌工作~日以继夜~ #line:09b352e
|
||||
<<character_into Express_1>>
|
||||
石头: 更快！更快！更快！我需要更快！医生，我需要安装高速运动模块！ #line:07ac1f8
|
||||
石头: 亲爱的医生，我从朋友那里淘来一个新模块；亲爱的医生，安装费贵吗？ #line:0e1cc9d
|
||||
<<character_into Express_3>>
|
||||
石头: 我~口袋空空；可是我，快乐很多~ #line:05f0c69
|
||||
我: 不贵不贵，那我们这就开始吧。 #line:01f83dd
|
||||
<<character_moveto_fix>>
|
||||
<<cover>>
|
||||
石头: 医生~不好意思~每次拆背板我都很害怕~你介意我~放声高歌吗？ #line:081c768
|
||||
我: 没关系，其实你一直在唱歌的。 #line:0090431
|
||||
石头: 啊！我们活在幸福镇的庇佑下~再多烦恼~只要工作~统统没掉~ #line:0a9e78c
|
||||
我: 我想想接下来是要做什么？先把背板拆掉吧. #line:0fb276a
|
||||
<<jump StartFix>>
|
||||
===
|
||||
|
||||
title: StartFix
|
||||
position: -118,318
|
||||
---
|
||||
<<load_scene GearScene>>
|
||||
我: 好的，这就是他的内部面板了。 #line:0d20ac5
|
||||
石头: 拆下来了？不好意思~很久没有维护~我的身体里有点乱。 #line:0bd0f8c
|
||||
石头: 那么医生~把我的运动模块接进去吧？这是跑了好久的单才挣到的呢！ #line:071d04e
|
||||
石头: 接下来就麻烦你~把旧的运动模块拆掉，把高级运动模块装上吧！ #line:0534428
|
||||
我: 好的，那我先拆掉它。 #line:05dec00
|
||||
<<hide_dialog>>
|
||||
===
|
||||
@@ -1,10 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1ee058dcdb33fa34fae654a509372bd0
|
||||
ScriptedImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 201339454033674448f997737049ce0e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"projectFileVersion": 2,
|
||||
"sourceFiles": [
|
||||
"*.yarn"
|
||||
],
|
||||
"excludeFiles": [
|
||||
"**/*~/*"
|
||||
],
|
||||
"localisation": {},
|
||||
"baseLanguage": "zh-CHS",
|
||||
"compilerOptions": {}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
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}
|
||||
@@ -1,12 +0,0 @@
|
||||
title: Start
|
||||
---
|
||||
me: test1.
|
||||
me: test2.
|
||||
me: test3.
|
||||
===
|
||||
|
||||
title: New
|
||||
---
|
||||
me: inter1.
|
||||
me: inter2.
|
||||
===
|
||||
@@ -1,10 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4643db09184d54d4f9c0c69236d3c501
|
||||
ScriptedImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
|
||||
@@ -47,9 +47,6 @@ position: 241,-2149
|
||||
<<declare $PlugAll=false>>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<<jump 引入对话>>
|
||||
|
||||
===
|
||||
@@ -104,8 +101,8 @@ position: 250,-1874
|
||||
<<indoor 1>>
|
||||
<<fade_out 1>>
|
||||
|
||||
// TODO 立绘指令修改
|
||||
【石头出现】
|
||||
|
||||
// FIXUP 立绘指令修改
|
||||
<<character_init_new "石头">>
|
||||
<<character_fade_in_new>>
|
||||
// 立绘指令修改
|
||||
@@ -209,6 +206,7 @@ position: -237,-1007
|
||||
me: 变速箱已经修好了，应该不会再发生动力中断了…一段时间内。
|
||||
<<endif>>
|
||||
|
||||
// FIXUP 这里用选择按钮推进
|
||||
<<if $gearProblemKnown==true && $gameStage==2>>
|
||||
->结束检查
|
||||
<<set $gameStage = $gameStage + 1>>
|
||||
@@ -220,6 +218,7 @@ position: -237,-1007
|
||||
<<set $gameStage = $gameStage + 1>>
|
||||
<<jump 主维修界面>>
|
||||
<<endif>>
|
||||
// 这里用选择按钮推进
|
||||
|
||||
===
|
||||
|
||||
|
||||
@@ -1,347 +0,0 @@
|
||||
%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}
|
||||
@@ -91,6 +91,10 @@ namespace AibisDream.FixSystem
|
||||
{
|
||||
coolingBottle.Rotate(true);
|
||||
}
|
||||
}
|
||||
|
||||
public void ChangeSlot(CoolingBottle coolingBottle)
|
||||
{
|
||||
InsertSlotEvent?.Invoke(coolingBottle);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ namespace AibisDream.FixSystem
|
||||
public void StartMove()
|
||||
{
|
||||
_rb.isKinematic = false;
|
||||
gameObject.layer = LayerMask.NameToLayer("Clinic");
|
||||
// 开始移动时就切换成横版
|
||||
Rotate(false);
|
||||
}
|
||||
@@ -92,13 +93,15 @@ namespace AibisDream.FixSystem
|
||||
// 更新到新的Slot
|
||||
curSnapSlot = targetSlot;
|
||||
|
||||
curSnapSlot.InsertSlot(this);
|
||||
curSnapSlot.ChangeSlot(this);
|
||||
}
|
||||
|
||||
targetSnapSlotSet.Clear();
|
||||
|
||||
// 吸附到目标位置
|
||||
_rb.isKinematic = true;
|
||||
gameObject.layer = LayerMask.NameToLayer("Default");
|
||||
curSnapSlot.InsertSlot(this);
|
||||
transform.DOMove(curSnapSlot.transform.position, SnapMoveTime);
|
||||
|
||||
// TODO 停止描边
|
||||
|
||||
@@ -68,14 +68,14 @@ namespace AibisDream.Framework
|
||||
public void InsertBottle(CoolingBottle bottle)
|
||||
{
|
||||
// 设置当前瓶子名称
|
||||
DialogController.Instance.SetVariable("$curBottleName", bottle.data.name);
|
||||
// 触发插入对话
|
||||
DialogController.Instance.StartDialogNode("插入冷却液");
|
||||
// DialogController.Instance.SetVariable("$curBottleName", bottle.data.name);
|
||||
// // 触发插入对话
|
||||
// DialogController.Instance.StartDialogNode("插入冷却液");
|
||||
}
|
||||
|
||||
public void RemoveBottle()
|
||||
{
|
||||
DialogController.Instance.SetVariable("$curBottleName", "");
|
||||
// DialogController.Instance.SetVariable("$curBottleName", "");
|
||||
}
|
||||
|
||||
public void Lock()
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 999ff60e53f68cc42b783630507e7781
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,41 +0,0 @@
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace AibisDream.Test
|
||||
{
|
||||
public class OptionTest : MonoBehaviour
|
||||
{
|
||||
private GameObject panel;
|
||||
private GameObject prefab;
|
||||
private GameObject[] buttonGroup;
|
||||
private YarnOption[] _options;
|
||||
|
||||
void Start()
|
||||
{
|
||||
// 初始化时注册Command
|
||||
// 第一个参数为[command name=xxx]的参数
|
||||
// 第二个参数是注册的函数，在Yarn走到选择项时触发
|
||||
DialogController.Instance.RegisterPauseCommand("show_buttons", ShowButtons);
|
||||
|
||||
// 不重要
|
||||
panel = transform.GetChild(0).gameObject;
|
||||
prefab = Resources.Load<GameObject>("Prefabs/UI/Choice Button");
|
||||
}
|
||||
|
||||
public void ShowButtons(YarnContinueStep step)
|
||||
{
|
||||
var option = step;
|
||||
var instance = Instantiate(prefab, panel.transform, true);
|
||||
var textMesh = instance.GetComponentInChildren<TextMeshProUGUI>();
|
||||
textMesh.text = "继续对话";
|
||||
|
||||
instance.GetComponent<Button>().onClick.AddListener(() => {
|
||||
// 执行SelectOption(), 对话就会从对应的选项往下继续执行
|
||||
option.ContinueTalk();
|
||||
instance.SetActive(false);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5897053db6d09014c809a2f20396e2ab
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1 @@
|
||||
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Lung","modulePicPath":"","modulePos":{"x":0.91,"y":1.84,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Heart","modulePicPath":"","modulePos":{"x":-3.89,"y":1.44,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"GearBox","modulePicPath":"","modulePos":{"x":-3.11,"y":0.08,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Liver","modulePicPath":"","modulePos":{"x":1.02,"y":-3.3,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false},{"moduleName":"Stomach","modulePicPath":"","modulePos":{"x":-3.77,"y":-3.81,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"indicatorPos":{"x":0.0,"y":0.0,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false,"cantStopRunning":false}]}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f9668465fd9c51748b8c47d8adb80210
|
||||
guid: d1db976de7d9c0545a776fa4f33b82f2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
@@ -0,0 +1 @@
|
||||
{"shaftLevelDataArray":[{"shaftName":"Empty Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.118,"y":-0.256,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.087,"y":-0.693,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.135,"y":0.182,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft9","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.71000111,"y":-0.9590002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft8","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"shaftPos":{"x":-2.59800124,"y":-0.941000164,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-2.22800064,"y":-0.453000158,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft6","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.855001,"y":-0.3910001,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft5","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.0,"y":-0.6250002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft4","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.18600082,"y":-0.08200007,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.97600079,"y":0.300000042,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-1.70600092,"y":0.307999939,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-2.40600061,"y":0.295000046,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.188,"y":0.445000023,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Target Shaft","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.1600008,"y":-0.9610002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"}]}
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8971b7cf758b7b445a14cc9734e44574
|
||||
folderAsset: yes
|
||||
guid: 53e1685c71c4ab64a8fcc123703b42e1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
Reference in New Issue
Block a user