Merge branch 'bugfix/小修改' into 'develop'
Bugfix/小修改 See merge request aibis-dream/aibis-dream!458
This commit is contained in:
Binary file not shown.
@@ -7,27 +7,27 @@ ScriptedImporter:
|
||||
type: UnityEngine:AnimationClip
|
||||
assembly: UnityEngine.AnimationModule
|
||||
name: BACK
|
||||
second: {fileID: 7400000, guid: f468217ea82a20c428e4018154d7858b, type: 2}
|
||||
second: {fileID: 7400000, guid: 9528dba10e77c4e4ab44b9fe930ee57a, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:AnimationClip
|
||||
assembly: UnityEngine.AnimationModule
|
||||
name: LDLE
|
||||
second: {fileID: 7400000, guid: 2c25950b2a5b69c45ab4a0fdf6aa78bf, type: 2}
|
||||
second: {fileID: 7400000, guid: 1ac1953319a20cb44ae8ea9fd6426a7b, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:AnimationClip
|
||||
assembly: UnityEngine.AnimationModule
|
||||
name: SMOKE
|
||||
second: {fileID: 7400000, guid: 01585ebd1fc9b1a43943f597b0266f21, type: 2}
|
||||
second: {fileID: 7400000, guid: dc1df083969867e45888d69272d24370, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:AnimationClip
|
||||
assembly: UnityEngine.AnimationModule
|
||||
name: WATCH BB
|
||||
second: {fileID: 7400000, guid: b3bc0bb2a201d9d49abf5e52d0f8f863, type: 2}
|
||||
second: {fileID: 7400000, guid: 7907b72abcc8a1c46b70452a24547ea9, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:AnimationClip
|
||||
assembly: UnityEngine.AnimationModule
|
||||
name: WATCH BB no smoking
|
||||
second: {fileID: 7400000, guid: adc0c401e94be8e4db5b6a03529b37fe, type: 2}
|
||||
second: {fileID: 7400000, guid: 1c7c4f4b7bac43e45a036b0f38e118a3, type: 2}
|
||||
serializedVersion: 2
|
||||
userData:
|
||||
assetBundleName:
|
||||
@@ -120,7 +120,7 @@ ScriptedImporter:
|
||||
addSortingGroup: 1
|
||||
addShadowCasters: 0
|
||||
importFileNodeState: 1
|
||||
platformSettingsDirtyTick: 638855385718028052
|
||||
platformSettingsDirtyTick: 638855982803340044
|
||||
textureAssetName:
|
||||
singleSpriteImportData:
|
||||
- name:
|
||||
|
||||
@@ -22,21 +22,21 @@ AnimationClip:
|
||||
curve:
|
||||
- time: 0
|
||||
value: {fileID: -8514517338866309172, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.099999905
|
||||
value: {fileID: 984439023966688038, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.20000005
|
||||
value: {fileID: 7981546461591964433, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.29999995
|
||||
value: {fileID: -2690999948767224948, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
value: {fileID: 984439023966688038, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.4000001
|
||||
value: {fileID: 7229991993330311839, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: -3226226679748518295, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
value: {fileID: 7981546461591964433, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.5999999
|
||||
value: {fileID: -2690999948767224948, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.79999995
|
||||
value: {fileID: 7229991993330311839, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: -3226226679748518295, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 1.1999998
|
||||
value: {fileID: -3038641201728466777, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.70000005
|
||||
- time: 1.4000001
|
||||
value: {fileID: -5954331129615843458, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- time: 0.8000001
|
||||
- time: 1.6000001
|
||||
value: {fileID: -5954331129615843458, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
@@ -49,19 +49,37 @@ AnimationClip:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings: []
|
||||
pptrCurveMapping: []
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
pptrCurveMapping:
|
||||
- {fileID: -8514517338866309172, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: 984439023966688038, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: 7981546461591964433, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: -2690999948767224948, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: 7229991993330311839, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: -3226226679748518295, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: -3038641201728466777, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: -5954331129615843458, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
- {fileID: -5954331129615843458, guid: eaa56b7f8e364d649a4a6bc4b76be3ac, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0.81000006
|
||||
m_StopTime: 1.6100001
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopTime: 0
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 01585ebd1fc9b1a43943f597b0266f21
|
||||
guid: dc1df083969867e45888d69272d24370
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
|
||||
@@ -99,7 +99,7 @@ AnimatorState:
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 01585ebd1fc9b1a43943f597b0266f21, type: 2}
|
||||
m_Motion: {fileID: 7400000, guid: dc1df083969867e45888d69272d24370, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
|
||||
@@ -477,15 +477,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 &-6101378415725230565
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
|
||||
@@ -96,7 +96,7 @@ me: 好，如果你同意…就请在手术单上签个字吧。 #line:08ba804
|
||||
<<wait 1.5>>
|
||||
me: 我们到治疗室来吧。 #line:086658c
|
||||
<<hide_dialog>>
|
||||
<<set_music_param event:/Music/music_peipei_1 peipei1_mus_stage 4>>
|
||||
<<set_global_param peipei1_mus_stage 4>>
|
||||
<<jump 结束术前谈话>>
|
||||
===
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ colorID: 3
|
||||
position: 251,-1150
|
||||
---
|
||||
<<fade_in 1>>
|
||||
<<set_sfx_param event:/Amb/amb amb_volume 1.25>>
|
||||
<<set_global_param amb_volume 1.25>>
|
||||
<<switch_fix_system_to BodyModule>>
|
||||
<<fade_out 1>>
|
||||
<<clear_tasks>>
|
||||
@@ -12,7 +12,7 @@ Task: 执行视觉-记忆桥截断术 #line:0deda99
|
||||
//<<task_moveIn>>
|
||||
me: 开始吧…截断视觉-记忆桥。 #line:03c70f2
|
||||
<<stop_music event:/Music/music_peipei_1 fade>>
|
||||
<<set_sfx_param event:/Amb/amb amb_volume 1.5>>
|
||||
<<set_global_param amb_volume 1.5>>
|
||||
<<play_timeline_cutline TimeLineController>>
|
||||
// <<ShowTool ToolManager Scissor>>
|
||||
===
|
||||
@@ -22,7 +22,7 @@ tags:
|
||||
group:手术相关
|
||||
position: -273,-66
|
||||
---
|
||||
<<set_sfx_param event:/Amb/amb amb_volume 1>>
|
||||
<<set_global_param amb_volume 1>>
|
||||
<<set_music_param event:/Music/mus_peipei peipeiEmo 0>>
|
||||
<<wait 0.5>>
|
||||
peipei: 啊…眼睛……我的…… #line:0133bd2
|
||||
|
||||
+2432
-2432
File diff suppressed because it is too large
Load Diff
@@ -5707,7 +5707,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 406, y: 150}
|
||||
m_SizeDelta: {x: 312, y: 150}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!114 &367483173
|
||||
MonoBehaviour:
|
||||
@@ -8361,7 +8361,7 @@ Transform:
|
||||
m_GameObject: {fileID: 519420028}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -9514,7 +9514,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: 282, y: -25}
|
||||
m_AnchoredPosition: {x: 188, y: -25}
|
||||
m_SizeDelta: {x: 64, y: 100}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &640896811
|
||||
@@ -9723,218 +9723,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 651726652}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &657549919
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 657549920}
|
||||
- component: {fileID: 657549924}
|
||||
- component: {fileID: 657549923}
|
||||
- component: {fileID: 657549922}
|
||||
- component: {fileID: 657549921}
|
||||
m_Layer: 5
|
||||
m_Name: Dialog Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &657549920
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 657549919}
|
||||
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: 725556430}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 1400, y: 800}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &657549921
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 657549919}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
useTypeWriter: 1
|
||||
startTypewriterMode: 2
|
||||
hideAppearancesOnSkip: 1
|
||||
hideDisappearancesOnSkip: 0
|
||||
triggerEventsOnSkip: 0
|
||||
resetTypingSpeedAtStartup: 1
|
||||
disappearanceOrientation: 0
|
||||
triggerShowedAfterEffectsEnd: 0
|
||||
triggerDisappearedAfterEffectsEnd: 0
|
||||
onTextShowed:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
onTypewriterStart:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
onTextDisappeared:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
onCharacterVisible:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
onMessage:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
waitForNormalChars: 0.033333335
|
||||
waitLong: 0.6
|
||||
waitMiddle: 0.2
|
||||
avoidMultiplePunctuationWait: 0
|
||||
waitForNewLines: 1
|
||||
waitForLastCharacter: 1
|
||||
useTypewriterWaitForDisappearances: 1
|
||||
disappearanceWaitTime: 0.015
|
||||
disappearanceSpeedMultiplier: 1
|
||||
--- !u!114 &657549922
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 657549919}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
typewriterStartsAutomatically: 1
|
||||
animationLoop: 0
|
||||
timeScale: 0
|
||||
_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
|
||||
useDynamicScaling: 1
|
||||
referenceFontSize: 10
|
||||
isResettingTimeOnNewText: 1
|
||||
useDefaultDatabases: 1
|
||||
databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2}
|
||||
databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2}
|
||||
useDefaultStyleSheet: 1
|
||||
styleSheet: {fileID: 0}
|
||||
databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2}
|
||||
defaultAppearancesTags:
|
||||
- 'fade '
|
||||
defaultDisappearancesTags:
|
||||
- fade
|
||||
defaultBehaviorsTags: []
|
||||
defaultTagsMode: 0
|
||||
--- !u!114 &657549923
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 657549919}
|
||||
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: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, 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: 46
|
||||
m_fontSizeBase: 46
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
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: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &657549924
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 657549919}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!224 &673669948 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 414774860242993632, guid: 8447f1c934ed28243b9924fb4d106a57, type: 3}
|
||||
@@ -10732,65 +10520,6 @@ PlayableDirector:
|
||||
value: {fileID: 135020139}
|
||||
m_ExposedReferences:
|
||||
m_References: []
|
||||
--- !u!1 &725556429
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 725556430}
|
||||
- component: {fileID: 725556432}
|
||||
- component: {fileID: 725556433}
|
||||
m_Layer: 5
|
||||
m_Name: Temp Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &725556430
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 725556429}
|
||||
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:
|
||||
- {fileID: 657549920}
|
||||
m_Father: {fileID: 1604842429}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 189}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &725556432
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 725556429}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &725556433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 725556429}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3bee0b70ea2946b8a6c59a4bceb04342, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
delayTime: 300
|
||||
--- !u!1001 &759307075
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13324,7 +13053,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &960307108
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -15247,7 +14976,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: 188, y: -25}
|
||||
m_AnchoredPosition: {x: 94, y: -25}
|
||||
m_SizeDelta: {x: 64, y: 100}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &1164645868
|
||||
@@ -21033,7 +20762,6 @@ RectTransform:
|
||||
- {fileID: 1302630844}
|
||||
- {fileID: 1586904153}
|
||||
- {fileID: 1403558893}
|
||||
- {fileID: 725556430}
|
||||
- {fileID: 238296903}
|
||||
m_Father: {fileID: 1110722291}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -23686,7 +23414,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: 376, y: -25}
|
||||
m_AnchoredPosition: {x: 282, y: -25}
|
||||
m_SizeDelta: {x: 64, y: 100}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &1928871882
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace AibisDream.FixSystem
|
||||
if (_isOpen) return;
|
||||
_isOpen = true;
|
||||
// 打开插槽
|
||||
if (_socketTween is { active: true } && _socketTween.IsPlaying()) _socketTween.Kill(true);
|
||||
if (_socketTween.IsActive() && _socketTween.IsPlaying()) _socketTween.Kill(true);
|
||||
var sequence = DOTween.Sequence();
|
||||
sequence.Join(_socketLeft.DOScale(new Vector3(0, 1, 1), 0.1f).SetEase(Ease.InSine));
|
||||
sequence.Join(_socketRight.DOScale(new Vector3(0, 1, 1), 0.1f).SetEase(Ease.InSine));
|
||||
@@ -122,7 +122,7 @@ namespace AibisDream.FixSystem
|
||||
|
||||
_isOpen = false;
|
||||
// 关闭插槽
|
||||
if (_socketTween != null && _socketTween.IsPlaying()) _socketTween.Kill(true);
|
||||
if (_socketTween.IsActive() && _socketTween.IsPlaying()) _socketTween.Kill(true);
|
||||
var sequence = DOTween.Sequence();
|
||||
sequence.Join(_socketLeft.DOScale(new Vector3(1, 1, 1), 0.1f).SetEase(Ease.OutSine));
|
||||
sequence.Join(_socketRight.DOScale(new Vector3(1, 1, 1), 0.1f).SetEase(Ease.OutSine));
|
||||
|
||||
@@ -39,6 +39,18 @@ namespace AibisDream
|
||||
ShowPanel<SettingPanel>();
|
||||
}
|
||||
}
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.C))
|
||||
{
|
||||
if (GetPanel<MainPanel>().IsOpen)
|
||||
{
|
||||
HidePanel<MainPanel>();
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowPanel<MainPanel>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void InitRefs()
|
||||
|
||||
Reference in New Issue
Block a user