Compare commits
139 Commits
main
...
WES-XX-tim
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2736de811d | ||
| b729981edf | |||
|
|
a0dd0ae39f | ||
|
|
f63b49ebc7 | ||
|
|
3dded6c3e6 | ||
|
|
10649e9b85 | ||
|
|
349ca1cb44 | ||
|
|
785e56b883 | ||
|
|
8c69ec3cc6 | ||
|
|
3d99184717 | ||
|
|
7505ae7262 | ||
|
|
1f5b855f61 | ||
|
|
384c7a249d | ||
|
|
bdf3c05102 | ||
|
|
584dc0d97d | ||
|
|
084724c175 | ||
|
|
1cceb3cb89 | ||
|
|
f99a73f230 | ||
|
|
e0c948292d | ||
|
|
7df6ea1ecd | ||
|
|
e9753a727e | ||
|
|
a4c29a3146 | ||
|
|
53fc361af4 | ||
|
|
d593f22c10 | ||
|
|
9b88537d70 | ||
|
|
96b1c9f6bc | ||
|
|
1e09f09dae | ||
|
|
1413f80d73 | ||
|
|
227099631e | ||
|
|
48b915acba | ||
|
|
672ff367e2 | ||
|
|
ae29ef9835 | ||
| c3ebf48cdc | |||
|
|
59bf2392d8 | ||
|
|
e9db885301 | ||
|
|
43887af670 | ||
|
|
06aa9206ac | ||
|
|
c24fe037f6 | ||
|
|
b10358930b | ||
|
|
89f343780a | ||
|
|
259259ac9c | ||
|
|
bc502361cd | ||
|
|
fb234480f7 | ||
|
|
b9bbef8dcf | ||
|
|
c4b6c60288 | ||
| c457a195df | |||
|
|
67575cfbbd | ||
|
|
05b230dd9d | ||
|
|
94d2ccfa8d | ||
|
|
966475455a | ||
|
|
4fdb8f95cb | ||
|
|
fcd8acad1e | ||
| 5b4a3ec4e7 | |||
|
|
77850bfbe6 | ||
|
|
f9fff14662 | ||
| aed09649e3 | |||
|
|
c8dfa96c8f | ||
|
|
4e9d801e61 | ||
|
|
04d9a4bf2b | ||
|
|
2b71bde592 | ||
|
|
73c4756f19 | ||
|
|
f5615bbef3 | ||
|
|
8670fcc4ce | ||
|
|
e6d10db5ca | ||
|
|
8db7c80dad | ||
|
|
197a6200c1 | ||
|
|
68372d859b | ||
|
|
2a7dd16f5f | ||
|
|
e6b0cbd596 | ||
|
|
c358ac59e4 | ||
|
|
c20cd89c3a | ||
|
|
5f4408063f | ||
| 3499e61bb0 | |||
|
|
aefc75f3c4 | ||
|
|
f95e34c6fe | ||
|
|
edf1805a92 | ||
|
|
a808e73a29 | ||
|
|
b955d2164c | ||
|
|
e96f1ff7ca | ||
|
|
b8cdcd128b | ||
|
|
ea13788199 | ||
|
|
564ec209c7 | ||
| a3735af649 | |||
|
|
692b4318bf | ||
|
|
0015c1453c | ||
|
|
c78ef0e773 | ||
|
|
45f545b13f | ||
|
|
d3af75f676 | ||
|
|
5f7216f24c | ||
|
|
b012e40df8 | ||
|
|
f69e2385fc | ||
|
|
37905a904c | ||
|
|
0019a4d07f | ||
|
|
4402e80d0c | ||
|
|
d95a6590d5 | ||
|
|
7b6eb4db69 | ||
|
|
8696aff135 | ||
|
|
001cf6dedb | ||
|
|
669bcb3793 | ||
|
|
668b769094 | ||
|
|
fee989006c | ||
|
|
b3913c281a | ||
|
|
b0c0cdc095 | ||
|
|
db37a16155 | ||
|
|
9c7366e49c | ||
|
|
5a5a1f1542 | ||
|
|
0e997666e2 | ||
|
|
6ef35cabd4 | ||
|
|
2581cd6137 | ||
|
|
800f0ae77f | ||
|
|
bb11f4d743 | ||
|
|
f835adaa23 | ||
| f9298a055a | |||
|
|
2e3dd2e26d | ||
|
|
f2743408a3 | ||
|
|
e23de9a2d3 | ||
|
|
b5328d0b9d | ||
|
|
44d3398e03 | ||
|
|
c9ee031df3 | ||
|
|
3abc24a39c | ||
|
|
f827c29d3a | ||
|
|
0a4cb9e8c6 | ||
|
|
ac000132a9 | ||
|
|
a19d89db03 | ||
|
|
8ff5c6c4c8 | ||
|
|
746906294b | ||
|
|
1a75791d62 | ||
|
|
9dfadece44 | ||
|
|
5e26970bad | ||
|
|
f6e6afe340 | ||
|
|
96fb3c89c3 | ||
|
|
dfc69ddd76 | ||
|
|
59d69f7412 | ||
|
|
a267301ab6 | ||
|
|
94ec7e0359 | ||
|
|
0c795b09bc | ||
|
|
8501edb03a | ||
|
|
cef72508cc | ||
|
|
17abca46ea |
@@ -1,42 +0,0 @@
|
|||||||
## Description
|
|
||||||
|
|
||||||
_Please provide a brief summary of the changes in this merge request._
|
|
||||||
|
|
||||||
_If possible, add a short screengrab or some screenshots of the changes._
|
|
||||||
|
|
||||||
## Testing Instructions
|
|
||||||
|
|
||||||
_Please provide instructions on how the code reviewers can test your changes:_
|
|
||||||
|
|
||||||
1. [Step 1]
|
|
||||||
2. [Step 2]
|
|
||||||
3. [Step 3]
|
|
||||||
4. ...
|
|
||||||
|
|
||||||
_Please include any specific information on test data, configurations, or other requirements that are necessary to properly test the changes._
|
|
||||||
|
|
||||||
Once you've tested the changes, please confirm that they work as expected and that there are no regressions or unexpected side effects. If any issues are discovered during testing, please include detailed steps to reproduce the issue in the merge request comments. Thank you!
|
|
||||||
|
|
||||||
## Related Issues
|
|
||||||
|
|
||||||
_Please list any related issues or pull requests that are relevant to this merge request._
|
|
||||||
_E.g. WES-XXX-..._
|
|
||||||
|
|
||||||
## Known bugs or issues
|
|
||||||
|
|
||||||
_Please list any known bugs or issues related to the changes in this merge request._
|
|
||||||
|
|
||||||
## Checklist
|
|
||||||
|
|
||||||
- [ ] I have filled in this template.
|
|
||||||
- [ ] I have tested my changes thoroughly (both in the editor + **build and run (ctrl+B)**!).
|
|
||||||
- [ ] I have added appropriate unit tests.
|
|
||||||
- [ ] I have added appropriate playmode tests.
|
|
||||||
- [ ] I have updated the user documentation as necessary.
|
|
||||||
- [ ] Code reviewed by 2 people.
|
|
||||||
|
|
||||||
## Additional Notes
|
|
||||||
|
|
||||||
_Please add any additional notes or comments that may be helpful for reviewers to understand your changes._
|
|
||||||
|
|
||||||
/assign_reviewer @wesign/unityappreviewers
|
|
||||||
@@ -370,7 +370,7 @@ MonoBehaviour:
|
|||||||
m_Elasticity: 0.1
|
m_Elasticity: 0.1
|
||||||
m_Inertia: 1
|
m_Inertia: 1
|
||||||
m_DecelerationRate: 0.135
|
m_DecelerationRate: 0.135
|
||||||
m_ScrollSensitivity: 50
|
m_ScrollSensitivity: 1
|
||||||
m_Viewport: {fileID: 1341560885}
|
m_Viewport: {fileID: 1341560885}
|
||||||
m_HorizontalScrollbar: {fileID: 0}
|
m_HorizontalScrollbar: {fileID: 0}
|
||||||
m_VerticalScrollbar: {fileID: 1252913994}
|
m_VerticalScrollbar: {fileID: 1252913994}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 34 KiB |
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
@@ -123,82 +123,6 @@ NavMeshSettings:
|
|||||||
debug:
|
debug:
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
--- !u!1 &118132293
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 118132294}
|
|
||||||
- component: {fileID: 118132296}
|
|
||||||
- component: {fileID: 118132295}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Handle
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &118132294
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 118132293}
|
|
||||||
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: 1115260563}
|
|
||||||
m_RootOrder: 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: 20, y: 20}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &118132295
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 118132293}
|
|
||||||
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: 0.9019608, g: 0.9019608, b: 0.9019608, 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: 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 &118132296
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 118132293}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &129643495
|
--- !u!1 &129643495
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -267,133 +191,6 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &224337874
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 224337875}
|
|
||||||
- component: {fileID: 224337878}
|
|
||||||
- component: {fileID: 224337877}
|
|
||||||
- component: {fileID: 224337876}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Scrollbar Vertical
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &224337875
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 224337874}
|
|
||||||
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: 1115260563}
|
|
||||||
m_Father: {fileID: 406632112}
|
|
||||||
m_RootOrder: 1
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 1, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: -20, y: 0}
|
|
||||||
m_SizeDelta: {x: 20, y: 0}
|
|
||||||
m_Pivot: {x: 1, y: 1}
|
|
||||||
--- !u!114 &224337876
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 224337874}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 118132295}
|
|
||||||
m_HandleRect: {fileID: 118132294}
|
|
||||||
m_Direction: 2
|
|
||||||
m_Value: 0
|
|
||||||
m_Size: 1
|
|
||||||
m_NumberOfSteps: 0
|
|
||||||
m_OnValueChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!114 &224337877
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 224337874}
|
|
||||||
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: 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 &224337878
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 224337874}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1001 &289602554
|
--- !u!1001 &289602554
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -544,84 +341,6 @@ RectTransform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
|
||||||
m_PrefabInstance: {fileID: 289602554}
|
m_PrefabInstance: {fileID: 289602554}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &406632111
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 406632112}
|
|
||||||
- component: {fileID: 406632114}
|
|
||||||
- component: {fileID: 406632113}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Scroll View
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &406632112
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 406632111}
|
|
||||||
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: 1268212031}
|
|
||||||
- {fileID: 224337875}
|
|
||||||
m_Father: {fileID: 906197777}
|
|
||||||
m_RootOrder: 4
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: -20, y: 0}
|
|
||||||
m_SizeDelta: {x: -360, y: -320.00003}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &406632113
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 406632111}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Content: {fileID: 1934345758}
|
|
||||||
m_Horizontal: 0
|
|
||||||
m_Vertical: 1
|
|
||||||
m_MovementType: 2
|
|
||||||
m_Elasticity: 0.1
|
|
||||||
m_Inertia: 1
|
|
||||||
m_DecelerationRate: 0.135
|
|
||||||
m_ScrollSensitivity: 50
|
|
||||||
m_Viewport: {fileID: 1268212031}
|
|
||||||
m_HorizontalScrollbar: {fileID: 0}
|
|
||||||
m_VerticalScrollbar: {fileID: 224337876}
|
|
||||||
m_HorizontalScrollbarVisibility: 2
|
|
||||||
m_VerticalScrollbarVisibility: 1
|
|
||||||
m_HorizontalScrollbarSpacing: -3
|
|
||||||
m_VerticalScrollbarSpacing: -3
|
|
||||||
m_OnValueChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!222 &406632114
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 406632111}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &519420028
|
--- !u!1 &519420028
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1275,7 +994,7 @@ RectTransform:
|
|||||||
- {fileID: 888670396}
|
- {fileID: 888670396}
|
||||||
- {fileID: 2034764082}
|
- {fileID: 2034764082}
|
||||||
- {fileID: 1503088043}
|
- {fileID: 1503088043}
|
||||||
- {fileID: 406632112}
|
- {fileID: 1934345758}
|
||||||
- {fileID: 1143402633}
|
- {fileID: 1143402633}
|
||||||
- {fileID: 289602555}
|
- {fileID: 289602555}
|
||||||
m_Father: {fileID: 1768150806}
|
m_Father: {fileID: 1768150806}
|
||||||
@@ -1459,43 +1178,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 994710774}
|
m_GameObject: {fileID: 994710774}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1115260562
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1115260563}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Sliding Area
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1115260563
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1115260562}
|
|
||||||
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: 118132294}
|
|
||||||
m_Father: {fileID: 224337875}
|
|
||||||
m_RootOrder: 0
|
|
||||||
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: -20, y: -20}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!1001 &1143402632
|
--- !u!1001 &1143402632
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1621,97 +1303,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c3dd279b546423e4a8a1b28819a6c4a1, type: 3}
|
m_Script: {fileID: 11500000, guid: c3dd279b546423e4a8a1b28819a6c4a1, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &1268212030
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1268212031}
|
|
||||||
- component: {fileID: 1268212034}
|
|
||||||
- component: {fileID: 1268212033}
|
|
||||||
- component: {fileID: 1268212032}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Viewport
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1268212031
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1268212030}
|
|
||||||
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: 1934345758}
|
|
||||||
m_Father: {fileID: 406632112}
|
|
||||||
m_RootOrder: 0
|
|
||||||
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: -17, y: 0}
|
|
||||||
m_Pivot: {x: 0, y: 1}
|
|
||||||
--- !u!114 &1268212032
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1268212030}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_ShowMaskGraphic: 0
|
|
||||||
--- !u!114 &1268212033
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1268212030}
|
|
||||||
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: 10917, 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 &1268212034
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1268212030}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &1417412674
|
--- !u!1 &1417412674
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2131,7 +1722,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1934345758}
|
- component: {fileID: 1934345758}
|
||||||
- component: {fileID: 1934345759}
|
- component: {fileID: 1934345759}
|
||||||
- component: {fileID: 1934345760}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Courses
|
m_Name: Courses
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -2146,18 +1736,18 @@ RectTransform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1934345757}
|
m_GameObject: {fileID: 1934345757}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1268212031}
|
m_Father: {fileID: 906197777}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 8.5, y: 0}
|
m_AnchoredPosition: {x: -20, y: 0}
|
||||||
m_SizeDelta: {x: 17, y: 0}
|
m_SizeDelta: {x: -360, y: -320.00003}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1934345759
|
--- !u!114 &1934345759
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -2183,20 +1773,6 @@ MonoBehaviour:
|
|||||||
m_Spacing: {x: 10, y: 10}
|
m_Spacing: {x: 10, y: 10}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
--- !u!114 &1934345760
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1934345757}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_HorizontalFit: 0
|
|
||||||
m_VerticalFit: 2
|
|
||||||
--- !u!1 &2034764081
|
--- !u!1 &2034764081
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -714,209 +714,6 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &707646139
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 707646140}
|
|
||||||
- component: {fileID: 707646142}
|
|
||||||
- component: {fileID: 707646141}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Handle
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &707646140
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 707646139}
|
|
||||||
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: 1602007151}
|
|
||||||
m_RootOrder: 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: 20, y: 20}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &707646141
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 707646139}
|
|
||||||
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: 0.9019608, g: 0.9019608, b: 0.9019608, 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: 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 &707646142
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 707646139}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &988918067
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 988918068}
|
|
||||||
- component: {fileID: 988918071}
|
|
||||||
- component: {fileID: 988918070}
|
|
||||||
- component: {fileID: 988918069}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Scrollbar Vertical
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &988918068
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 988918067}
|
|
||||||
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: 1602007151}
|
|
||||||
m_Father: {fileID: 1173036066}
|
|
||||||
m_RootOrder: 1
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 1, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: -20, y: 0}
|
|
||||||
m_SizeDelta: {x: 20, y: 0}
|
|
||||||
m_Pivot: {x: 1, y: 1}
|
|
||||||
--- !u!114 &988918069
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 988918067}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 707646141}
|
|
||||||
m_HandleRect: {fileID: 707646140}
|
|
||||||
m_Direction: 2
|
|
||||||
m_Value: 0
|
|
||||||
m_Size: 1
|
|
||||||
m_NumberOfSteps: 0
|
|
||||||
m_OnValueChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!114 &988918070
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 988918067}
|
|
||||||
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: 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 &988918071
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 988918067}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &1093369503
|
--- !u!1 &1093369503
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1310,84 +1107,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1099058600}
|
m_GameObject: {fileID: 1099058600}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1173036065
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1173036066}
|
|
||||||
- component: {fileID: 1173036069}
|
|
||||||
- component: {fileID: 1173036067}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Scroll View
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1173036066
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1173036065}
|
|
||||||
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: 2133732459}
|
|
||||||
- {fileID: 988918068}
|
|
||||||
m_Father: {fileID: 1380805077}
|
|
||||||
m_RootOrder: 6
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
|
||||||
m_AnchoredPosition: {x: -20, y: 0}
|
|
||||||
m_SizeDelta: {x: -360, y: -320}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &1173036067
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1173036065}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Content: {fileID: 2146756454}
|
|
||||||
m_Horizontal: 0
|
|
||||||
m_Vertical: 1
|
|
||||||
m_MovementType: 2
|
|
||||||
m_Elasticity: 0.1
|
|
||||||
m_Inertia: 1
|
|
||||||
m_DecelerationRate: 0.135
|
|
||||||
m_ScrollSensitivity: 50
|
|
||||||
m_Viewport: {fileID: 2133732459}
|
|
||||||
m_HorizontalScrollbar: {fileID: 0}
|
|
||||||
m_VerticalScrollbar: {fileID: 988918069}
|
|
||||||
m_HorizontalScrollbarVisibility: 2
|
|
||||||
m_VerticalScrollbarVisibility: 1
|
|
||||||
m_HorizontalScrollbarSpacing: -3
|
|
||||||
m_VerticalScrollbarSpacing: -3
|
|
||||||
m_OnValueChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!222 &1173036069
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1173036065}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &1380805076
|
--- !u!1 &1380805076
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1420,11 +1139,11 @@ RectTransform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 413373408}
|
- {fileID: 413373408}
|
||||||
- {fileID: 1099058601}
|
- {fileID: 1099058601}
|
||||||
|
- {fileID: 2146756454}
|
||||||
- {fileID: 2126874143}
|
- {fileID: 2126874143}
|
||||||
- {fileID: 2141275317}
|
|
||||||
- {fileID: 1605366630}
|
- {fileID: 1605366630}
|
||||||
- {fileID: 238926234}
|
- {fileID: 238926234}
|
||||||
- {fileID: 1173036066}
|
- {fileID: 2141275317}
|
||||||
m_Father: {fileID: 79114699}
|
m_Father: {fileID: 79114699}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -1528,43 +1247,6 @@ Transform:
|
|||||||
m_Father: {fileID: 1800407625}
|
m_Father: {fileID: 1800407625}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1602007150
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1602007151}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Sliding Area
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1602007151
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1602007150}
|
|
||||||
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: 707646140}
|
|
||||||
m_Father: {fileID: 988918068}
|
|
||||||
m_RootOrder: 0
|
|
||||||
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: -20, y: -20}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!1001 &1605366629
|
--- !u!1001 &1605366629
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1969,7 +1651,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1380805077}
|
m_Father: {fileID: 1380805077}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
@@ -2034,97 +1716,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2126874142}
|
m_GameObject: {fileID: 2126874142}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &2133732458
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 2133732459}
|
|
||||||
- component: {fileID: 2133732462}
|
|
||||||
- component: {fileID: 2133732461}
|
|
||||||
- component: {fileID: 2133732460}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Viewport
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &2133732459
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2133732458}
|
|
||||||
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: 2146756454}
|
|
||||||
m_Father: {fileID: 1173036066}
|
|
||||||
m_RootOrder: 0
|
|
||||||
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: -17, y: 0}
|
|
||||||
m_Pivot: {x: 0, y: 1}
|
|
||||||
--- !u!114 &2133732460
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2133732458}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_ShowMaskGraphic: 0
|
|
||||||
--- !u!114 &2133732461
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2133732458}
|
|
||||||
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: 10917, 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 &2133732462
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2133732458}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &2141275316
|
--- !u!1 &2141275316
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2157,7 +1748,7 @@ RectTransform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1380805077}
|
m_Father: {fileID: 1380805077}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 6
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
@@ -2232,7 +1823,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2146756454}
|
- component: {fileID: 2146756454}
|
||||||
- component: {fileID: 2146756455}
|
- component: {fileID: 2146756455}
|
||||||
- component: {fileID: 2146756456}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Minigames
|
m_Name: Minigames
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -2252,13 +1842,13 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2133732459}
|
m_Father: {fileID: 1380805077}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 8.5, y: 0}
|
m_AnchoredPosition: {x: -20, y: 0}
|
||||||
m_SizeDelta: {x: 17, y: 0}
|
m_SizeDelta: {x: -360, y: -320}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2146756455
|
--- !u!114 &2146756455
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -2284,17 +1874,3 @@ MonoBehaviour:
|
|||||||
m_Spacing: {x: 10, y: 10}
|
m_Spacing: {x: 10, y: 10}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
--- !u!114 &2146756456
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2146756453}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_HorizontalFit: 0
|
|
||||||
m_VerticalFit: 2
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ MonoBehaviour:
|
|||||||
- name: B
|
- name: B
|
||||||
image: {fileID: 21300000, guid: 4dda47b7ae59ce0499ff8e89a310b351, type: 3}
|
image: {fileID: 21300000, guid: 4dda47b7ae59ce0499ff8e89a310b351, type: 3}
|
||||||
handGuide: {fileID: 21300000, guid: 8e050dadd89377d4fb62a4ad8f9e8535, type: 3}
|
handGuide: {fileID: 21300000, guid: 8e050dadd89377d4fb62a4ad8f9e8535, type: 3}
|
||||||
thresholdDistance: 2.5
|
thresholdDistance: 2
|
||||||
clip: {fileID: 32900000, guid: 67ba2ca6a212e9d419c63721add61d9c, type: 3}
|
clip: {fileID: 32900000, guid: 67ba2ca6a212e9d419c63721add61d9c, type: 3}
|
||||||
- name: C
|
- name: C
|
||||||
image: {fileID: 21300000, guid: bb08a500be7994743bdf7f1e38e6538e, type: 3}
|
image: {fileID: 21300000, guid: bb08a500be7994743bdf7f1e38e6538e, type: 3}
|
||||||
@@ -95,7 +95,7 @@ MonoBehaviour:
|
|||||||
- name: P
|
- name: P
|
||||||
image: {fileID: 21300000, guid: 070eca79d6b8ece479abe291f5ecf1f1, type: 3}
|
image: {fileID: 21300000, guid: 070eca79d6b8ece479abe291f5ecf1f1, type: 3}
|
||||||
handGuide: {fileID: 21300000, guid: de3b948a0c6e04547afffebadd53c44e, type: 3}
|
handGuide: {fileID: 21300000, guid: de3b948a0c6e04547afffebadd53c44e, type: 3}
|
||||||
thresholdDistance: 3.2
|
thresholdDistance: 2
|
||||||
clip: {fileID: 32900000, guid: 08d75a672ec46414fae021039c2380c1, type: 3}
|
clip: {fileID: 32900000, guid: 08d75a672ec46414fae021039c2380c1, type: 3}
|
||||||
- name: Q
|
- name: Q
|
||||||
image: {fileID: 21300000, guid: 26f522f2e30c5b640b3e21aedc311346, type: 3}
|
image: {fileID: 21300000, guid: 26f522f2e30c5b640b3e21aedc311346, type: 3}
|
||||||
@@ -135,7 +135,7 @@ MonoBehaviour:
|
|||||||
- name: X
|
- name: X
|
||||||
image: {fileID: 21300000, guid: 034ab0453d401c243901dc5c74eccda5, type: 3}
|
image: {fileID: 21300000, guid: 034ab0453d401c243901dc5c74eccda5, type: 3}
|
||||||
handGuide: {fileID: 21300000, guid: 2c38602225a250a45be1017aab650a3d, type: 3}
|
handGuide: {fileID: 21300000, guid: 2c38602225a250a45be1017aab650a3d, type: 3}
|
||||||
thresholdDistance: 3.5
|
thresholdDistance: 3
|
||||||
clip: {fileID: 32900000, guid: af3988ecb4a3980499f4b0779e936e25, type: 3}
|
clip: {fileID: 32900000, guid: af3988ecb4a3980499f4b0779e936e25, type: 3}
|
||||||
- name: Y
|
- name: Y
|
||||||
image: {fileID: 21300000, guid: 9e46e7579c4695f429c05fe204fe2442, type: 3}
|
image: {fileID: 21300000, guid: 9e46e7579c4695f429c05fe204fe2442, type: 3}
|
||||||
@@ -145,5 +145,5 @@ MonoBehaviour:
|
|||||||
- name: Z
|
- name: Z
|
||||||
image: {fileID: 21300000, guid: e3ddc281a25573d479ee69e8f0196b53, type: 3}
|
image: {fileID: 21300000, guid: e3ddc281a25573d479ee69e8f0196b53, type: 3}
|
||||||
handGuide: {fileID: 21300000, guid: de44788bbe2193043a246d12d2df52e5, type: 3}
|
handGuide: {fileID: 21300000, guid: de44788bbe2193043a246d12d2df52e5, type: 3}
|
||||||
thresholdDistance: 3.5
|
thresholdDistance: 3
|
||||||
clip: {fileID: 32900000, guid: 5d82445a6d218a2489827783599de116, type: 3}
|
clip: {fileID: 32900000, guid: 5d82445a6d218a2489827783599de116, type: 3}
|
||||||
|
|||||||
@@ -170,6 +170,11 @@ public partial class SpellingBeeController : AbstractMinigameController
|
|||||||
get { return fingerspelling; }
|
get { return fingerspelling; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Timer to keep track of how long a sign is performed
|
||||||
|
/// </summary>
|
||||||
|
protected DateTime acceptance_test_timer;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Update is called once per frame
|
/// Update is called once per frame
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -280,6 +285,7 @@ public partial class SpellingBeeController : AbstractMinigameController
|
|||||||
letterIndex++;
|
letterIndex++;
|
||||||
} while (letterIndex < currentWord.Length && currentWord[letterIndex] == ' ');
|
} while (letterIndex < currentWord.Length && currentWord[letterIndex] == ' ');
|
||||||
|
|
||||||
|
acceptance_test_timer = DateTime.Now;
|
||||||
// Change the color of the next letter or change to new word
|
// Change the color of the next letter or change to new word
|
||||||
if (letterIndex < currentWord.Length)
|
if (letterIndex < currentWord.Length)
|
||||||
{
|
{
|
||||||
@@ -377,6 +383,8 @@ public partial class SpellingBeeController : AbstractMinigameController
|
|||||||
bool successful = sign.ToUpper() == currentWord[letterIndex].ToString().ToUpper();
|
bool successful = sign.ToUpper() == currentWord[letterIndex].ToString().ToUpper();
|
||||||
if (successful)
|
if (successful)
|
||||||
{
|
{
|
||||||
|
// Timer acceptance test
|
||||||
|
Debug.Log(DateTime.Now - acceptance_test_timer);
|
||||||
AddSeconds(secondsPerLetter);
|
AddSeconds(secondsPerLetter);
|
||||||
}
|
}
|
||||||
NextLetter(successful);
|
NextLetter(successful);
|
||||||
@@ -529,6 +537,9 @@ public partial class SpellingBeeController : AbstractMinigameController
|
|||||||
|
|
||||||
scoreDisplay.text = $"Score: {CalculateScore()}";
|
scoreDisplay.text = $"Score: {CalculateScore()}";
|
||||||
scoreBonus.text = "";
|
scoreBonus.text = "";
|
||||||
|
|
||||||
|
// timer for acceptance test
|
||||||
|
acceptance_test_timer = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -186,12 +186,8 @@ PlayerSettings:
|
|||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
- {fileID: 0}
|
- {fileID: 11400000, guid: 6ded44152d5c1ef49a004fb7d14f9987, type: 2}
|
||||||
- {fileID: 0}
|
- {fileID: 11400000, guid: a465991eb14bf5e408a5ae44b5e52904, type: 2}
|
||||||
- {fileID: 0}
|
|
||||||
- {fileID: 0}
|
|
||||||
- {fileID: 11400000, guid: 662c8e1604f97b4469fee7126acb5a53, type: 2}
|
|
||||||
- {fileID: 11400000, guid: 37bcc2de59adcbd4cbf3b7428b23fdaf, type: 2}
|
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
@@ -368,13 +364,6 @@ PlayerSettings:
|
|||||||
m_Width: 16
|
m_Width: 16
|
||||||
m_Height: 16
|
m_Height: 16
|
||||||
m_Kind: 0
|
m_Kind: 0
|
||||||
- m_BuildTarget:
|
|
||||||
m_Icons:
|
|
||||||
- serializedVersion: 2
|
|
||||||
m_Icon: {fileID: 2800000, guid: 2c14d1c6768afe7408785447021f122b, type: 3}
|
|
||||||
m_Width: 128
|
|
||||||
m_Height: 128
|
|
||||||
m_Kind: 0
|
|
||||||
m_BuildTargetPlatformIcons: []
|
m_BuildTargetPlatformIcons: []
|
||||||
m_BuildTargetBatching: []
|
m_BuildTargetBatching: []
|
||||||
m_BuildTargetShaderSettings: []
|
m_BuildTargetShaderSettings: []
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user