finall dda update all working YESSSSS
This commit is contained in:
immaunicorn107
parent
be4c63ba7c
commit
4042cb223e
10 changed files with 5964 additions and 45 deletions
|
|
@ -28,13 +28,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2761784063978902507}
|
||||
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: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2761784063978902503
|
||||
MonoBehaviour:
|
||||
|
|
@ -98,6 +98,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_ActivateInput:
|
||||
|
|
@ -127,6 +128,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_SelectActionTrigger: 0
|
||||
|
|
@ -238,6 +240,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_UIScrollInput:
|
||||
|
|
@ -323,6 +326,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_ScaleOverTimeInput:
|
||||
|
|
@ -355,6 +359,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
--- !u!120 &2761784063978902504
|
||||
LineRenderer:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
|
|
@ -449,16 +454,20 @@ LineRenderer:
|
|||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
numCornerVertices: 0
|
||||
numCapVertices: 0
|
||||
alignment: 0
|
||||
textureMode: 0
|
||||
textureScale: {x: 1, y: 1}
|
||||
shadowBias: 0.5
|
||||
generateLightingData: 0
|
||||
m_MaskInteraction: 0
|
||||
m_UseWorldSpace: 1
|
||||
m_Loop: 0
|
||||
m_ApplyActiveColorSpace: 0
|
||||
--- !u!114 &2761784063978902505
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -531,6 +540,7 @@ MonoBehaviour:
|
|||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
m_InvalidColorGradient:
|
||||
|
|
@ -560,6 +570,7 @@ MonoBehaviour:
|
|||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
m_BlockedColorGradient:
|
||||
|
|
@ -589,6 +600,7 @@ MonoBehaviour:
|
|||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_ColorSpace: -1
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
m_TreatSelectionAsValidState: 0
|
||||
|
|
@ -615,6 +627,7 @@ SortingGroup:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 30005
|
||||
m_SortAtRoot: 0
|
||||
--- !u!114 &3616344554909481683
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 202364687}
|
||||
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}
|
||||
|
|
@ -37,7 +38,6 @@ Transform:
|
|||
- {fileID: 1319746309}
|
||||
- {fileID: 8366379412631108205}
|
||||
m_Father: {fileID: 1680501587}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &4778211696441940833
|
||||
MonoBehaviour:
|
||||
|
|
@ -210,6 +210,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1670256624}
|
||||
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}
|
||||
|
|
@ -220,7 +221,6 @@ Transform:
|
|||
- {fileID: 2449787133337329436}
|
||||
- {fileID: 6528530117482412838}
|
||||
m_Father: {fileID: 1680501587}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5663893676086941514
|
||||
MonoBehaviour:
|
||||
|
|
@ -389,6 +389,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1680501586}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.36144, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
|
|
@ -402,7 +403,6 @@ Transform:
|
|||
- {fileID: 1670256625}
|
||||
- {fileID: 8718302446126152263}
|
||||
m_Father: {fileID: 1717954561962503726}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1767192433
|
||||
GameObject:
|
||||
|
|
@ -430,13 +430,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1767192433}
|
||||
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: 1680501587}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!20 &1767192439
|
||||
Camera:
|
||||
|
|
@ -452,9 +452,17 @@ Camera:
|
|||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_Iso: 200
|
||||
m_ShutterSpeed: 0.005
|
||||
m_Aperture: 16
|
||||
m_FocusDistance: 10
|
||||
m_FocalLength: 50
|
||||
m_BladeCount: 5
|
||||
m_Curvature: {x: 2, y: 11}
|
||||
m_BarrelClipping: 0.25
|
||||
m_Anamorphism: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
|
|
@ -614,13 +622,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 58445280694286476}
|
||||
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: 6981642495833523204}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &153982007679157697
|
||||
MonoBehaviour:
|
||||
|
|
@ -699,13 +707,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1470279098769358944}
|
||||
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: 6981642495833523204}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7347985736721345035
|
||||
MonoBehaviour:
|
||||
|
|
@ -825,6 +833,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1717954561962503725}
|
||||
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}
|
||||
|
|
@ -833,7 +842,6 @@ Transform:
|
|||
- {fileID: 1680501587}
|
||||
- {fileID: 6981642495833523204}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1178791450436251564
|
||||
MonoBehaviour:
|
||||
|
|
@ -860,9 +868,17 @@ CharacterController:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1717954561962503725}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Height: 1.36144
|
||||
m_Radius: 0.1
|
||||
m_SlopeLimit: 45
|
||||
|
|
@ -963,13 +979,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1787516059220952802}
|
||||
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: 8718302446126152263}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2190828208922718286
|
||||
GameObject:
|
||||
|
|
@ -995,13 +1011,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2190828208922718286}
|
||||
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: 6981642495833523204}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1748222016861356527
|
||||
MonoBehaviour:
|
||||
|
|
@ -1042,6 +1058,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2626757739553014894}
|
||||
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}
|
||||
|
|
@ -1049,7 +1066,6 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 2749926995908329476}
|
||||
m_Father: {fileID: 6981642495833523204}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5739245880472075158
|
||||
MonoBehaviour:
|
||||
|
|
@ -1096,6 +1112,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2766569358201078490}
|
||||
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}
|
||||
|
|
@ -1103,7 +1120,6 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 150171005766949883}
|
||||
m_Father: {fileID: 1680501587}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1801942220539511183
|
||||
MonoBehaviour:
|
||||
|
|
@ -1148,13 +1164,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3533369827395663398}
|
||||
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: 6981642495833523204}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2032798983271290625
|
||||
MonoBehaviour:
|
||||
|
|
@ -1205,6 +1221,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_GrabMoveAction:
|
||||
|
|
@ -1268,6 +1285,7 @@ MonoBehaviour:
|
|||
m_ManualValue: 0
|
||||
m_ManualQueuePerformed: 0
|
||||
m_ManualQueueWasPerformedThisFrame: 0
|
||||
m_ManualQueueWasCompletedThisFrame: 0
|
||||
m_ManualQueueValue: 0
|
||||
m_ManualQueueTargetFrame: 0
|
||||
m_GrabMoveAction:
|
||||
|
|
@ -1333,13 +1351,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4026763789982141574}
|
||||
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: 716906830792148215}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &5167925059111895691
|
||||
GameObject:
|
||||
|
|
@ -1366,6 +1384,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5167925059111895691}
|
||||
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}
|
||||
|
|
@ -1377,7 +1396,6 @@ Transform:
|
|||
- {fileID: 7401259364726987263}
|
||||
- {fileID: 8418786636219059989}
|
||||
m_Father: {fileID: 1717954561962503726}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6640002710935096923
|
||||
MonoBehaviour:
|
||||
|
|
@ -1431,6 +1449,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5563199296126487199}
|
||||
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}
|
||||
|
|
@ -1438,7 +1457,6 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 5556032914392612086}
|
||||
m_Father: {fileID: 1680501587}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3752199730057449385
|
||||
MonoBehaviour:
|
||||
|
|
@ -1482,13 +1500,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5617778599117486727}
|
||||
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: 8418786636219059989}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &758862941726224967
|
||||
MonoBehaviour:
|
||||
|
|
@ -1574,6 +1592,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6501755809687671949}
|
||||
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}
|
||||
|
|
@ -1581,7 +1600,6 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 8381546940850731792}
|
||||
m_Father: {fileID: 1680501587}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &9068281059075228377
|
||||
MonoBehaviour:
|
||||
|
|
@ -1623,19 +1641,20 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6553456492286146741}
|
||||
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: 3595914740002285240}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &494449108016059778
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 202364688}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8270855663187062767, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
||||
|
|
@ -1687,6 +1706,9 @@ PrefabInstance:
|
|||
value: Left Controller Visual
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1392f805216c47742996d4742c80721c, type: 3}
|
||||
--- !u!4 &8366379412631108205 stripped
|
||||
Transform:
|
||||
|
|
@ -1698,6 +1720,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1670256625}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
|
|
@ -1752,6 +1775,10 @@ PrefabInstance:
|
|||
propertyPath: m_Parameters.numCapVertices
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
propertyPath: m_Parameters.widthMultiplier
|
||||
value: 0.01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
propertyPath: m_Parameters.numCornerVertices
|
||||
value: 4
|
||||
|
|
@ -1817,6 +1844,9 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 4238984354899526239}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
--- !u!114 &2449787133337329425 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -1839,6 +1869,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 202364688}
|
||||
m_Modifications:
|
||||
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
|
|
@ -1906,6 +1937,12 @@ PrefabInstance:
|
|||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2814764233898000032}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
--- !u!4 &1666320186578454293 stripped
|
||||
Transform:
|
||||
|
|
@ -1938,6 +1975,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 202364688}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
|
|
@ -1988,6 +2026,10 @@ PrefabInstance:
|
|||
propertyPath: m_Parameters.numCapVertices
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
propertyPath: m_Parameters.widthMultiplier
|
||||
value: 0.01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
propertyPath: m_Parameters.numCornerVertices
|
||||
value: 4
|
||||
|
|
@ -2057,6 +2099,9 @@ PrefabInstance:
|
|||
value:
|
||||
objectReference: {fileID: 5967689310316253315}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3}
|
||||
--- !u!4 &1319746309 stripped
|
||||
Transform:
|
||||
|
|
@ -2079,6 +2124,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1670256625}
|
||||
m_Modifications:
|
||||
- target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
|
|
@ -2142,6 +2188,12 @@ PrefabInstance:
|
|||
value: -10
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2052418245113747934}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3}
|
||||
--- !u!114 &2141651114331267770 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -2174,6 +2226,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1670256625}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2447424620550846319, guid: b200f6587d118224eba8467281481800, type: 3}
|
||||
|
|
@ -2225,6 +2278,9 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b200f6587d118224eba8467281481800, type: 3}
|
||||
--- !u!114 &1883230248363655243 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -2247,6 +2303,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 202364688}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4804964734930210078, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||
|
|
@ -2298,6 +2355,9 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3}
|
||||
--- !u!4 &1543070802843469984 stripped
|
||||
Transform:
|
||||
|
|
@ -2320,6 +2380,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1666320186578454293}
|
||||
m_Modifications:
|
||||
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
|
|
@ -2387,12 +2448,21 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
--- !u!4 &2814764233898000032 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
m_PrefabInstance: {fileID: 6764233457049000944}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7400760887118150798
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3954319948395782924}
|
||||
m_Modifications:
|
||||
- target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
|
|
@ -2460,12 +2530,21 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
--- !u!4 &2052418245113747934 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3}
|
||||
m_PrefabInstance: {fileID: 7400760887118150798}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7684238452101615925
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1670256625}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3475118261464492563, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
||||
|
|
@ -2517,6 +2596,9 @@ PrefabInstance:
|
|||
value: Right Controller Visual
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3}
|
||||
--- !u!4 &6528530117482412838 stripped
|
||||
Transform:
|
||||
|
|
@ -2528,6 +2610,7 @@ PrefabInstance:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1680501587}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3055433562365713971, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
||||
|
|
@ -2591,6 +2674,9 @@ PrefabInstance:
|
|||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3}
|
||||
--- !u!4 &2196849375614954873 stripped
|
||||
Transform:
|
||||
|
|
|
|||
|
|
@ -58490,6 +58490,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
storyPanelUI: {fileID: 620624014}
|
||||
storyText: {fileID: 1214791149}
|
||||
authManager: {fileID: 0}
|
||||
--- !u!43 &278678358
|
||||
Mesh:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -422295,7 +422296,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
trashCollected: 0
|
||||
trashRequired: 7
|
||||
trashRequired: 3
|
||||
door: {fileID: 1545748364}
|
||||
lockedDoorUI: {fileID: 1786768887}
|
||||
storyPanelUI: {fileID: 620624014}
|
||||
|
|
|
|||
|
|
@ -826,6 +826,128 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 6045648537344725186, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3}
|
||||
m_PrefabInstance: {fileID: 1558242618}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &593261346
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 593261351}
|
||||
- component: {fileID: 593261350}
|
||||
- component: {fileID: 593261349}
|
||||
- component: {fileID: 593261348}
|
||||
- component: {fileID: 593261347}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &593261347
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 593261346}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 0
|
||||
m_CheckFor2DOcclusion: 0
|
||||
m_CheckFor3DOcclusion: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RaycastTriggerInteraction: 1
|
||||
--- !u!114 &593261348
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 593261346}
|
||||
m_Enabled: 0
|
||||
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 &593261349
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 593261346}
|
||||
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: 1
|
||||
--- !u!223 &593261350
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 593261346}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
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: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &593261351
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 593261346}
|
||||
m_LocalRotation: {x: -0, y: -0.7071066, z: -0, w: 0.707107}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 3.1622055, y: 3.1622055, z: 3.1622055}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 887944466}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -1.067, y: 1.846}
|
||||
m_SizeDelta: {x: 1, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &615859126
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1354,6 +1476,127 @@ MonoBehaviour:
|
|||
m_OnKeyboardFocusChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &887944465
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 887944466}
|
||||
- component: {fileID: 887944469}
|
||||
- component: {fileID: 887944468}
|
||||
- component: {fileID: 887944467}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &887944466
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 887944465}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.0018602117, y: 0.0018602117, z: 0.0018602117}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1728568263}
|
||||
m_Father: {fileID: 593261351}
|
||||
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.115}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &887944467
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 887944465}
|
||||
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.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
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: 887944468}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &887944468
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 887944465}
|
||||
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: 1}
|
||||
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: 10905, 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 &887944469
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 887944465}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1008685332
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2556,6 +2799,140 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1560672658}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1728568262
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1728568263}
|
||||
- component: {fileID: 1728568265}
|
||||
- component: {fileID: 1728568264}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1728568263
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728568262}
|
||||
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: 887944466}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1728568264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728568262}
|
||||
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: Button
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
|
||||
m_fontSizeBase: 24
|
||||
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: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1728568265
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728568262}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1746833873
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2783,7 +3160,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &1774110360
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3388,3 +3765,4 @@ SceneRoots:
|
|||
- {fileID: 1184216214}
|
||||
- {fileID: 1417843899}
|
||||
- {fileID: 770206628}
|
||||
- {fileID: 593261351}
|
||||
|
|
|
|||
5312
Game/Assets/Scenes/test.unity
Normal file
5312
Game/Assets/Scenes/test.unity
Normal file
File diff suppressed because it is too large
Load diff
7
Game/Assets/Scenes/test.unity.meta
Normal file
7
Game/Assets/Scenes/test.unity.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d5d710c83ba9c4bc9a3cb137c74bca51
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -35,6 +35,9 @@ public class GameManager : MonoBehaviour
|
|||
private string _lastSceneName;
|
||||
private bool _teethBrushed;
|
||||
|
||||
public AuthManager authManager; // Add this line to the GameManager
|
||||
|
||||
|
||||
// current day, publicly readable, privately settable
|
||||
|
||||
// for public access, setting is a no-op
|
||||
|
|
@ -149,11 +152,15 @@ public class GameManager : MonoBehaviour
|
|||
// for mark (backend): u can track whether they want to do their tasks, some people may be unmotivated to
|
||||
// do the tasks in game, then we can ask them irl why they didn't do the task
|
||||
|
||||
// Tracks if the bedroom is cleaned or not
|
||||
// Tracks if the bedroom is cleaned or not
|
||||
public void BedroomTaskComplete()
|
||||
{
|
||||
_bedroomCleaned = true;
|
||||
AreTasksDone();
|
||||
|
||||
// Call AuthManager to update the Firebase database
|
||||
//authManager.UpdateTaskStatus("Day1", "clean room", true); // Example: Update "clean room" task to completed
|
||||
}
|
||||
|
||||
// Tracks if teeth are brushed or not
|
||||
|
|
@ -161,6 +168,9 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
_teethBrushed = true;
|
||||
AreTasksDone();
|
||||
|
||||
// Call AuthManager to update the Firebase database
|
||||
//authManager.UpdateTaskStatus("Day1", "Brush teeth", true); // Update "Brush teeth" task to completed
|
||||
}
|
||||
|
||||
// Tracks if the floor has been swept or not
|
||||
|
|
@ -168,11 +178,18 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
_floorSwept = true;
|
||||
AreTasksDone();
|
||||
|
||||
// Call AuthManager to update the Firebase database
|
||||
authManager.UpdateTaskStatus("Day1", "Sweep floor", true); // Update "Sweep floor" task to completed
|
||||
}
|
||||
|
||||
|
||||
public void GoToSchoolTaskComplete()
|
||||
{
|
||||
_goToSchool = true;
|
||||
|
||||
// Call AuthManager to update the Firebase database
|
||||
authManager.UpdateTaskStatus("Day2", "go to school", true); // Update "go to school" task to completed
|
||||
}
|
||||
|
||||
// Increments the current day by 1
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ public class PhoneInteraction : MonoBehaviour
|
|||
private bool _choiceMade;
|
||||
private bool _phonePickedUp;
|
||||
|
||||
public AuthManager authManager;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
// Ensure AudioSource is available
|
||||
|
|
@ -63,6 +65,10 @@ public class PhoneInteraction : MonoBehaviour
|
|||
Debug.Log("Phone Answered! Loading GoodEnding...");
|
||||
choiceUI.SetActive(false);
|
||||
SceneManager.LoadScene("GoodEnding");
|
||||
|
||||
authManager.UpdatePickupCallStatus(true); // Call the function to update Firebase
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void DeclineCall()
|
||||
|
|
@ -71,5 +77,8 @@ public class PhoneInteraction : MonoBehaviour
|
|||
Debug.Log("Call Declined! Loading BadEnding...");
|
||||
choiceUI.SetActive(false);
|
||||
SceneManager.LoadScene("BadEnding");
|
||||
|
||||
authManager.UpdatePickupCallStatus(false); // Call the function to update Firebase
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,3 @@
|
|||
|
||||
|
||||
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
|
@ -34,14 +31,35 @@ public class AuthManager : MonoBehaviour
|
|||
public TMP_InputField passwordRegisterVerifyField;
|
||||
public TMP_Text warningRegisterText;
|
||||
|
||||
|
||||
void Awake()
|
||||
{
|
||||
if (FindObjectOfType<AuthManager>() != this)
|
||||
{
|
||||
Destroy(gameObject); // Ensure only one instance exists
|
||||
return;
|
||||
}
|
||||
|
||||
DontDestroyOnLoad(gameObject); // Make this object persistent
|
||||
|
||||
FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task =>
|
||||
{
|
||||
dependencyStatus = task.Result;
|
||||
if (dependencyStatus == DependencyStatus.Available)
|
||||
{
|
||||
InitializeFirebase();
|
||||
|
||||
// Remove the automatic login check
|
||||
// Do not log in automatically even if the user is authenticated
|
||||
// Just log the current user status for debugging or later use
|
||||
if (auth.CurrentUser != null)
|
||||
{
|
||||
Debug.Log("User is already authenticated: " + auth.CurrentUser.Email);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("No user is currently logged in.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -50,6 +68,7 @@ public class AuthManager : MonoBehaviour
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
private void InitializeFirebase()
|
||||
{
|
||||
Debug.Log("Setting up Firebase Auth and Database");
|
||||
|
|
@ -95,9 +114,13 @@ public class AuthManager : MonoBehaviour
|
|||
Debug.LogFormat("User signed in successfully: {0} ({1})", User.DisplayName, User.Email);
|
||||
warningLoginText.text = "";
|
||||
confirmLoginText.text = "Logged In";
|
||||
|
||||
// ✅ Load the main game scene
|
||||
UnityEngine.SceneManagement.SceneManager.LoadScene("2"); // Change "GameScene" to your target scene
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private IEnumerator Register(string _email, string _password, string _username)
|
||||
{
|
||||
if (_username == "")
|
||||
|
|
@ -112,6 +135,7 @@ public class AuthManager : MonoBehaviour
|
|||
{
|
||||
Task<AuthResult> RegisterTask = auth.CreateUserWithEmailAndPasswordAsync(_email, _password);
|
||||
yield return new WaitUntil(() => RegisterTask.IsCompleted);
|
||||
|
||||
if (RegisterTask.Exception != null)
|
||||
{
|
||||
Debug.LogWarning($"Failed to register task with {RegisterTask.Exception}");
|
||||
|
|
@ -145,25 +169,24 @@ public class AuthManager : MonoBehaviour
|
|||
}
|
||||
else
|
||||
{
|
||||
UserStats newUserStats = new UserStats();
|
||||
StartCoroutine(SaveUserData(_username, User.UserId, _password, newUserStats));
|
||||
// ✅ Save user data to Firebase after username is successfully set
|
||||
StartCoroutine(SaveUserData(_username, User.UserId, _password));
|
||||
|
||||
warningRegisterText.text = "";
|
||||
//UIManager.instance.LoginScreen();
|
||||
//UIManager.instance.LoginScreen(); // Uncomment if you have a UI transition
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Use userId (authManager.User.UserId) to store data
|
||||
private IEnumerator SaveUserData(string username, string uid, string password, UserStats userStats)
|
||||
// Use userId (authManager.User.UserId) to store data
|
||||
private IEnumerator SaveUserData(string username, string uid, string password)
|
||||
{
|
||||
// Convert UserStats object to a dictionary dynamically
|
||||
var statsData = userStats.ToDictionary();
|
||||
|
||||
var playerData = new Dictionary<string, object>
|
||||
{
|
||||
{ "stat", statsData }, // Use the dynamic stats dictionary here
|
||||
{ "player_info", new Dictionary<string, object>
|
||||
{
|
||||
{ "username", username },
|
||||
|
|
@ -175,17 +198,31 @@ public class AuthManager : MonoBehaviour
|
|||
{
|
||||
{ "Day1", new Dictionary<string, object>
|
||||
{
|
||||
{ "tasks", new List<string> { "clean room", "go to school" } }
|
||||
{ "tasks", new List<Dictionary<string, object>>
|
||||
{
|
||||
new Dictionary<string, object> { { "task", "clean room" }, { "completed", false } },
|
||||
new Dictionary<string, object> { { "task", "Brush teeth" }, { "completed", false } },
|
||||
new Dictionary<string, object> { { "task", "Sweep floor" }, { "completed", false } }
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{ "Day2", new Dictionary<string, object>
|
||||
{
|
||||
{ "tasks", new List<string> { "go to school" } }
|
||||
{ "tasks", new List<Dictionary<string, object>>
|
||||
{
|
||||
new Dictionary<string, object> { { "task", "go to school" }, { "completed", false } }
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{ "Day3", new Dictionary<string, object>
|
||||
{
|
||||
{ "tasks", new List<string> { "picks up call" } }
|
||||
{ "tasks", new List<Dictionary<string, object>>
|
||||
{
|
||||
new Dictionary<string, object> { { "task", "picks up call" }, { "pickupcall", false } }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -204,12 +241,68 @@ public class AuthManager : MonoBehaviour
|
|||
{
|
||||
Debug.Log("Player data saved successfully.");
|
||||
}
|
||||
} }
|
||||
|
||||
internal class UserStats
|
||||
{
|
||||
internal object ToDictionary()
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
}
|
||||
public void UpdateTaskStatus(string day, string taskName, bool isCompleted)
|
||||
{
|
||||
if (auth.CurrentUser != null)
|
||||
{
|
||||
string uid = auth.CurrentUser.UserId; // Get the current user's UID
|
||||
|
||||
// Reference the correct day and task in Firebase
|
||||
var taskUpdate = new Dictionary<string, object>
|
||||
{
|
||||
{ "completed", isCompleted }
|
||||
};
|
||||
|
||||
dbReference.Child("Players").Child(uid).Child(day).Child("tasks")
|
||||
.Child(taskName).UpdateChildrenAsync(taskUpdate).ContinueWith(task =>
|
||||
{
|
||||
if (task.Exception != null)
|
||||
{
|
||||
Debug.LogWarning($"Failed to update task status: {task.Exception}");
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"Task {taskName} on {day} updated to completed.");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// The UpdatePickupCallStatus method should be placed outside the other methods in your AuthManager class
|
||||
|
||||
public void UpdatePickupCallStatus(bool pickupCallStatus)
|
||||
{
|
||||
if (auth.CurrentUser != null)
|
||||
{
|
||||
string uid = auth.CurrentUser.UserId; // Get the current user's UID
|
||||
|
||||
// Reference the correct day and task in Firebase
|
||||
var pickupCallUpdate = new Dictionary<string, object>
|
||||
{
|
||||
{ "pickupcall", pickupCallStatus }
|
||||
};
|
||||
|
||||
// Update the pickupcall status for Day 3
|
||||
dbReference.Child("Players").Child(uid).Child("Day3").Child("tasks")
|
||||
.Child("picks up call").UpdateChildrenAsync(pickupCallUpdate).ContinueWith(task =>
|
||||
{
|
||||
if (task.Exception != null)
|
||||
{
|
||||
Debug.LogWarning($"Failed to update pickupcall status: {task.Exception}");
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"pickupcall status updated to {pickupCallStatus}.");
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("No user is currently authenticated.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -14,6 +14,9 @@ EditorBuildSettings:
|
|||
- enabled: 0
|
||||
path: Assets/Scenes/Testing Scenes/Wai Lam's interaction.unity
|
||||
guid: 66fe0e94fa29b1f4fb504e90cf59f1a2
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/test.unity
|
||||
guid: d5d710c83ba9c4bc9a3cb137c74bca51
|
||||
- enabled: 0
|
||||
path: Assets/Scenes/Testing Scenes/isaac interaction.unity
|
||||
guid: 0918c8f89e6184c5caed264887eabbb4
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue