From 999ce2507d10c762ca168f4569671a98d6119090 Mon Sep 17 00:00:00 2001 From: yanghua <1475658476@qq.com> Date: Wed, 25 Dec 2024 17:48:18 +0800 Subject: [PATCH] 1 --- .gitignore | 1 + Assets/Scenes/10007_7002_03_OfficeScene.unity | 1162 +- Assets/Scripts/MobileAttach10007_7002.cs | 4 +- Assets/Scripts/Player10007_7002.cs | 16 +- Assets/Scripts/Score_7002.cs | 12 +- Assets/Scripts/StepState_7002.cs | 13 +- ...stallAndDismantleTicketPanel_10007_7002.cs | 45 +- Assets/Template.meta | 8 + Assets/Template/ArtRes.meta | 8 + .../去学习-悬浮@1x.png | Bin 0 -> 3165 bytes .../去学习-悬浮@1x.png.meta | 159 + .../去学习-默认@1x.png | Bin 0 -> 2915 bytes .../去学习-默认@1x.png.meta | 159 + .../重新练习-悬浮@1x.png | Bin 0 -> 4062 bytes .../重新练习-悬浮@1x.png.meta | 159 + .../重新练习-默认@1x.png | Bin 0 -> 3808 bytes .../重新练习-默认@1x.png.meta | 159 + Assets/Template/Arts.meta | 8 + Assets/Template/Default.meta | 8 + Assets/Template/GameAssets.meta | 8 + .../GameAssets/Models/Elc man/anime/Walk.anim | 26822 +++++++++++++++- Assets/Template/Resources.meta | 8 + .../UI_Panel/UI_PracticeCompletedPanel.prefab | 134 +- Assets/Template/Scenes.meta | 8 + Assets/Template/Scripts.meta | 8 + .../Scripts/Project/Manager/GameManager.cs | 25 + .../Scripts/Project/Manager/NetManager.cs | 4 +- .../Scripts/Project/Manager/OfficeManager.cs | 1 + .../Objects/Other/OfficeTimelineControl.cs | 9 +- .../Project/UI/UI_Item/UI_PracticeInfoItem.cs | 4 +- .../Project/UI/UI_Panel/UI_MainTitlePanel.cs | 4 +- .../UI/UI_Panel/UI_PracticeCompletedPanel.cs | 45 +- .../Project/UI/UI_Panel/UI_TaskListPanel.cs | 1 - Assets/Template/Standard.meta | 8 + Assets/Template/TextMesh Pro.meta | 8 + Assets/Template/Tree_Textures.meta | 8 + new_10007_YanCheng_Metrology.sln | 86 + 37 files changed, 29023 insertions(+), 89 deletions(-) create mode 100644 Assets/Template.meta create mode 100644 Assets/Template/ArtRes.meta create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png.meta create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png.meta create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png.meta create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-默认@1x.png create mode 100644 Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-默认@1x.png.meta create mode 100644 Assets/Template/Arts.meta create mode 100644 Assets/Template/Default.meta create mode 100644 Assets/Template/GameAssets.meta create mode 100644 Assets/Template/Resources.meta create mode 100644 Assets/Template/Scenes.meta create mode 100644 Assets/Template/Scripts.meta create mode 100644 Assets/Template/Standard.meta create mode 100644 Assets/Template/TextMesh Pro.meta create mode 100644 Assets/Template/Tree_Textures.meta create mode 100644 new_10007_YanCheng_Metrology.sln diff --git a/.gitignore b/.gitignore index dbbac37..ea15d5d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /Assets/StreamingAssets/build_info.txt.meta /Assets/StreamingAssets/build_info.txt /10007_YanCheng_Metrology.sln +/10007 diff --git a/Assets/Scenes/10007_7002_03_OfficeScene.unity b/Assets/Scenes/10007_7002_03_OfficeScene.unity index dcb6eb6..eb2392f 100644 --- a/Assets/Scenes/10007_7002_03_OfficeScene.unity +++ b/Assets/Scenes/10007_7002_03_OfficeScene.unity @@ -123,6 +123,67 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &38225444 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1411090331} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalPosition.x + value: -0.12 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalPosition.y + value: 0.011 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalPosition.z + value: 5.634 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_Name + value: Electrician_man + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 17a7fbd6727d90e44b8e9159e5f08945, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} --- !u!1001 &267617284 PrefabInstance: m_ObjectHideFlags: 0 @@ -377,6 +438,21 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1136531137 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + m_PrefabInstance: {fileID: 38225444} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1136531138 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + m_PrefabInstance: {fileID: 38225444} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1136531139 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9171eca83e743a24d9191ba07b562eb5, type: 3} + m_PrefabInstance: {fileID: 38225444} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1202455765 PrefabInstance: m_ObjectHideFlags: 0 @@ -520,7 +596,7 @@ PlayableDirector: - key: {fileID: -421950645239995520, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} value: {fileID: 2089319125} - key: {fileID: 5639829736059126345, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} - value: {fileID: 1768481226} + value: {fileID: 1136531137} - key: {fileID: 8733411975691198292, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} value: {fileID: 772251467} - key: {fileID: 2207534078990385599, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} @@ -528,9 +604,9 @@ PlayableDirector: - key: {fileID: 2540533597311288102, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} value: {fileID: 1411090333} - key: {fileID: -7517325925010075830, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} - value: {fileID: 1768481225} + value: {fileID: 1136531138} - key: {fileID: -583877099758490811, guid: 282730ee68b4dac45b34f2c80f5a8340, type: 2} - value: {fileID: 1768481225} + value: {fileID: 1136531138} m_ExposedReferences: m_References: [] --- !u!4 &1411090331 @@ -548,6 +624,7 @@ Transform: - {fileID: 1768481224} - {fileID: 2089319124} - {fileID: 772251465} + - {fileID: 1136531139} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -563,7 +640,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5436cda1c4b71f044bcd6efe54bbfc28, type: 3} m_Name: m_EditorClassIdentifier: - playerModel: {fileID: 1768481226} + playerModel: {fileID: 1136531137} aniCamera: {fileID: 772251462} --- !u!114 &1411090333 MonoBehaviour: @@ -717,6 +794,90 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1411090331} m_Modifications: + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.19909132 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00015938276 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000020492826 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000018674808 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000014295438 + objectReference: {fileID: 0} + - target: {fileID: -9114496787053588016, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0000000018236381 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.033019017 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000012827503 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000003823511 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9918143 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00027393133 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000052765532 + objectReference: {fileID: 0} + - target: {fileID: -9008153141848265789, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.12768844 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.02743777 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 9.677015e-10 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000000079162366 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9663793 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0001742281 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.2571206 + objectReference: {fileID: 0} + - target: {fileID: -8973633458650696646, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0002181232 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bab65147af79bc847876b53f253d65c4, type: 3} propertyPath: m_RootOrder value: 0 @@ -761,18 +922,1002 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000000018881094 + objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000000074505775 + objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97848207 + objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00017467653 + objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.20633183 + objectReference: {fileID: 0} + - target: {fileID: -8277219861787284164, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.00018195063 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.43254557 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000014901153 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000011781221 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9922974 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0028241875 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.01928957 + objectReference: {fileID: 0} + - target: {fileID: -8201243596049249177, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.12233509 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.109943576 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000010244547 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000011175874 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8279849 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.103966966 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5458474 + objectReference: {fileID: 0} + - target: {fileID: -8075957436024654702, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.07538226 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.21933104 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.016789991 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000012852252 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.000000011864017 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009287214 + objectReference: {fileID: 0} + - target: {fileID: -7836229474298620029, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -8.184742e-10 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.03280263 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000000432992 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000037553473 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9921845 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.0002734241 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000053719446 + objectReference: {fileID: 0} + - target: {fileID: -7711547707797742996, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.124779195 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.020461934 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.019813089 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.094446205 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0033885532 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.62557924 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0033885308 + objectReference: {fileID: 0} + - target: {fileID: -7679827221957098577, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.78014594 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.08216326 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.017738804 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.005835309 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.96435404 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.049399637 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.13393985 + objectReference: {fileID: 0} + - target: {fileID: -7253560465440474485, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.22280261 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.03799197 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000056585073 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -4.36557e-11 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97668016 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00027743034 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000028275892 + objectReference: {fileID: 0} + - target: {fileID: -6518403741143962724, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.21469954 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.4129567 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000026547246 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000005123152 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98817533 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.010017128 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.008180298 + objectReference: {fileID: 0} + - target: {fileID: -5706326537154493506, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.152782 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0017612572 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.08506187 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.017625768 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.037864972 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9964937 + objectReference: {fileID: 0} + - target: {fileID: -5036476678694501429, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.07249857 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.23466927 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000004889444 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000019557774 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.666552 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7454582 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00045663962 + objectReference: {fileID: 0} + - target: {fileID: -4720697313668813613, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0006475747 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.08216318 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.017738864 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9711934 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.030875858 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.074028075 + objectReference: {fileID: 0} + - target: {fileID: -4583262984842850175, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.2243882 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.03280255 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000043357414 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -6.184559e-10 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9953788 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0002718966 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00006142522 + objectReference: {fileID: 0} + - target: {fileID: -4385206395623768455, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.096025996 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.08005224 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.14953308 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 7.530613e-10 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000003467448 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000003539025 + objectReference: {fileID: 0} + - target: {fileID: -3819404319153452631, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.031795338 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.02851763 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.042872537 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.94325095 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.025746927 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.30954435 + objectReference: {fileID: 0} + - target: {fileID: -3528682428417141526, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.117460944 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.088578165 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.013120658 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.014953892 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98377115 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.035575505 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.074954584 + objectReference: {fileID: 0} + - target: {fileID: -2238356161864358465, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.15909292 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.020490803 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000012867521 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000024214376 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97646695 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00015965103 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.21566725 + objectReference: {fileID: 0} + - target: {fileID: -2008750099041922396, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000121779725 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.037767738 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000012536468 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000037849496 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97999674 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00027682362 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00003269839 + objectReference: {fileID: 0} + - target: {fileID: 740505284520107097, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.1990136 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.09725263 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00015846638 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0006192278 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000044703484 + objectReference: {fileID: 0} + - target: {fileID: 908276781140129939, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000020861626 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bab65147af79bc847876b53f253d65c4, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bab65147af79bc847876b53f253d65c4, type: 3} propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.037991997 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000056585073 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -9.377754e-11 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.95637923 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.0002787756 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000006519744 + objectReference: {fileID: 0} + - target: {fileID: 1581366488025998145, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.29212788 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.012377738 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00049395114 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.050615564 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.49842972 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.49702987 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5032248 + objectReference: {fileID: 0} + - target: {fileID: 1764910268326094525, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.50129235 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.033019166 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000008927591 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 3.400266e-11 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9959186 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00027160556 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000063220905 + objectReference: {fileID: 0} + - target: {fileID: 1890891121820447947, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.09025613 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.031795356 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.02851751 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04287257 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.95939356 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.008212916 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.23218325 + objectReference: {fileID: 0} + - target: {fileID: 2064438156919203888, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.15996057 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.06547623 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.008356894 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000010244545 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000018725405 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000018725399 + objectReference: {fileID: 0} + - target: {fileID: 3436036755398836469, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 6.926371e-11 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.08005221 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.14953306 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000014886419 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000035411016 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000358559 + objectReference: {fileID: 0} + - target: {fileID: 3492060867779311132, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071066 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.037767768 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000012529191 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -1.08230515e-10 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.94833165 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00027884694 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000008164529 + objectReference: {fileID: 0} + - target: {fileID: 4366653345078686359, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.31728083 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.22456127 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000000055879337 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000014901165 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9952109 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.09102793 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0017733276 + objectReference: {fileID: 0} + - target: {fileID: 4999907361363490952, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.035584196 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0016483214 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0840818 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.00047651923 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.1403204 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9900498 + objectReference: {fileID: 0} + - target: {fileID: 5026965684383827013, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.010558862 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.08857814 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.013120548 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.014953881 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.99306047 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.015962126 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.024020566 + objectReference: {fileID: 0} + - target: {fileID: 5648790279931104185, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.114014156 + objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: bab65147af79bc847876b53f253d65c4, type: 3} propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: 7d4f976745a1f094ab30e5c910020019, type: 2} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 5.2386895e-10 + objectReference: {fileID: 0} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000020954756 + objectReference: {fileID: 0} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.6499999 + objectReference: {fileID: 0} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7599285 + objectReference: {fileID: 0} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.001535001 + objectReference: {fileID: 0} + - target: {fileID: 6306161381825080894, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.002527756 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.020405756 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.020267477 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.09436206 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0012939869 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.64111304 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.0012939497 + objectReference: {fileID: 0} + - target: {fileID: 6926397970895717033, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7674443 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.22456133 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000014901158 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9926152 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.069784015 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.004635215 + objectReference: {fileID: 0} + - target: {fileID: 6976052342319732797, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.09911533 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.42041922 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00000006060325 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000009483154 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9932494 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.07215106 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.04577778 + objectReference: {fileID: 0} + - target: {fileID: 7469618404995525408, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.07844863 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.109943375 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000009255018 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000029802326 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.81727386 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.109079905 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.56089205 + objectReference: {fileID: 0} + - target: {fileID: 8708022323581199993, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.07460053 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.42486694 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00000011920929 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000000372529 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.95568854 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.0010685999 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.005183404 + objectReference: {fileID: 0} + - target: {fileID: 8896563786012999581, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.29433236 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.x + value: -0.020490825 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000012129012 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000006705518 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.99175584 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.00016519053 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.12814182 + objectReference: {fileID: 0} + - target: {fileID: 9183234109526168904, guid: bab65147af79bc847876b53f253d65c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000058308236 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bab65147af79bc847876b53f253d65c4, type: 3} --- !u!4 &1768481224 stripped @@ -785,11 +1930,6 @@ Animator: m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bab65147af79bc847876b53f253d65c4, type: 3} m_PrefabInstance: {fileID: 1768481223} m_PrefabAsset: {fileID: 0} ---- !u!1 &1768481226 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bab65147af79bc847876b53f253d65c4, type: 3} - m_PrefabInstance: {fileID: 1768481223} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1904940670 PrefabInstance: m_ObjectHideFlags: 0 @@ -921,6 +2061,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mobileController: {fileID: 919132148358585193} + mobileAttch10007: {fileID: 919132148358585196} --- !u!1 &2077900027 GameObject: m_ObjectHideFlags: 0 @@ -1727,6 +2868,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a4ed54c66afe3643853ff74613b1b08, type: 3} m_Name: m_EditorClassIdentifier: + index: 0 --- !u!1 &919132148708085627 GameObject: m_ObjectHideFlags: 0 @@ -3777,7 +4919,7 @@ Transform: m_GameObject: {fileID: 6944469734800208480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.000014, y: -104.49999, z: -47.90006} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1.007, z: 1.1637} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2089319124} diff --git a/Assets/Scripts/MobileAttach10007_7002.cs b/Assets/Scripts/MobileAttach10007_7002.cs index a778729..5a0dd01 100644 --- a/Assets/Scripts/MobileAttach10007_7002.cs +++ b/Assets/Scripts/MobileAttach10007_7002.cs @@ -4,10 +4,10 @@ using UnityEngine; public class MobileAttach10007_7002 : MonoBehaviour { - public static int index = 0; + public int index = 0; public void OnReceiveTask(string triggerName) { - if(index == 0) + if (index == 0) { if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0) { diff --git a/Assets/Scripts/Player10007_7002.cs b/Assets/Scripts/Player10007_7002.cs index 934955c..206ce22 100644 --- a/Assets/Scripts/Player10007_7002.cs +++ b/Assets/Scripts/Player10007_7002.cs @@ -2,23 +2,23 @@ using System.Collections.Generic; using UnityEngine; -public class Player10007_7002 : MonoBehaviour +public class Player10007_7002 : SingletonMono { - private int moveNum = 0; - private Vector3 lastMovePos = new Vector3(0, 0, 0); + public int moveNum = 0; + public Vector3 lastMovePos = new Vector3(0, 0, 0); public List cdzList = new List(); - public static bool isNearCDZ = false; + public bool isNearCDZ = false; private void Start() { isNearCDZ = false; } private void Update() { - if(lastMovePos != this.transform.localPosition) + if (lastMovePos != this.transform.localPosition) { lastMovePos = this.transform.localPosition; moveNum++; - if(moveNum == 500) + if (moveNum == 500) { //Debug.LogError("巡视OK"); //GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId); @@ -30,7 +30,7 @@ public class Player10007_7002 : MonoBehaviour } } //Debug.LogError(GameManager.ProcessMgr.subProcessStepId); - if(!isNearCDZ && Score_7002.cdzIndex == 1) + if (!isNearCDZ && Score_7002.cdzIndex == 1) { int len = cdzList.Count; //isNearCDZ = false; @@ -49,6 +49,6 @@ public class Player10007_7002 : MonoBehaviour } } } - + } } diff --git a/Assets/Scripts/Score_7002.cs b/Assets/Scripts/Score_7002.cs index 5879e28..554f700 100644 --- a/Assets/Scripts/Score_7002.cs +++ b/Assets/Scripts/Score_7002.cs @@ -31,7 +31,7 @@ public class Score_7002 : ScoreBase private Device_Control_2002 device_Control; public static Dictionary> xzDic = new Dictionary>(); public static int cdzIndex = 0; - public static List scoreList = new List() {0,0,0,0,0,0,0,0 ,0}; + public static List scoreList; public static int process = 0; public static Dictionary static_steps; public static Action SendMsg; @@ -56,14 +56,14 @@ public class Score_7002 : ScoreBase } List tmps= new List(); - tmps.Add(new ScoreSubjectStep(1, 0)); + tmps.Add(new ScoreSubjectStep(1, 5)); tmps.Add(new ScoreSubjectStep(2, 5)); - tmps.Add(new ScoreSubjectStep(3, 0)); + tmps.Add(new ScoreSubjectStep(3, 5)); tmps.Add(new ScoreSubjectStep(4, 5)); - tmps.Add(new ScoreSubjectStep(5, 40)); + tmps.Add(new ScoreSubjectStep(5, 30)); tmps.Add(new ScoreSubjectStep(6, 5)); - tmps.Add(new ScoreSubjectStep(7, 45)); - tmps.Add(new ScoreSubjectStep(8, 0)); + tmps.Add(new ScoreSubjectStep(7, 40)); + tmps.Add(new ScoreSubjectStep(8, 5)); steps = new Dictionary(); tmps.ForEach(a => diff --git a/Assets/Scripts/StepState_7002.cs b/Assets/Scripts/StepState_7002.cs index b0550fa..a37c9d5 100644 --- a/Assets/Scripts/StepState_7002.cs +++ b/Assets/Scripts/StepState_7002.cs @@ -36,7 +36,8 @@ public class StepState_7002 : StepState { Debug.Log("л" + num); //ɾĶ - LiveSceneManager.Instance?.OnCheckSubProcess(); + if (LiveSceneManager.Instance != null) + LiveSceneManager.Instance.OnCheckSubProcess(); Score_7002.process = num - 1; if (num == 1) { @@ -44,12 +45,14 @@ public class StepState_7002 : StepState //鿴 //OfficeManager.Instance.mobileController.downIndex = 0; PacksackBagMgr.Instance.ClearAllData(); - MobileAttach10007_7002.index = 0; + OfficeManager.Instance.mobileController.downIndex = 0; + OfficeManager.Instance.mobileAttch10007.index = 0; Score_7002.cdzIndex = 0; } else if (num == 2) { - MobileAttach10007_7002.index = 1; + OfficeManager.Instance.mobileController.downIndex = 2; + OfficeManager.Instance.mobileAttch10007.index = 1; Score_7002.cdzIndex = 0; } else if (num == 3) @@ -59,10 +62,12 @@ public class StepState_7002 : StepState else if (num == 4) { Score_7002.cdzIndex = 0; + Player10007_7002.Instance.moveNum = 0; } else if (num == 5) { Score_7002.cdzIndex = 0; + Player10007_7002.Instance.moveNum = 500; } else if (num == 6) { @@ -72,7 +77,7 @@ public class StepState_7002 : StepState { Score_7002.cdzIndex = 2; } - else if(num == 8) + else if (num == 8) { GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("ֳ", true); } diff --git a/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs b/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs index 8323422..ab32aa8 100644 --- a/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs +++ b/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs @@ -10,10 +10,10 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel /// /// ǷѾȷύ /// - private bool submit=false; + private bool submit = false; public string triggerName; - + public void Init(string triggerName) { this.triggerName = triggerName; @@ -41,6 +41,30 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel } private void showToogle() + { + CloseToggle(true); + for (int j = 1; j <= Score_7002.xzDic[2].Count; j++) + { + for (int k = 0; k < Score_7002.xzDic[2][j].Length; k++) + { + GetControl("t2_" + j + "_" + k).enabled = Player10007_7002.Instance.isNearCDZ; + } + } + } + public void showToggle(int xzDicCount) + { + for (int j = 1; j <= Score_7002.xzDic[xzDicCount].Count; j++) + { + for (int k = 0; k < Score_7002.xzDic[xzDicCount][j].Length; k++) + { + if (Score_7002.xzDic[xzDicCount][j][k]) + { + GetControl("t" + xzDicCount + "_" + j + "_" + k).isOn = true; + } + } + } + } + public void CloseToggle(bool isSwitch) { for (int i = 1; i <= Score_7002.xzDic.Count; i++) { @@ -48,20 +72,13 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel { for (int k = 0; k < Score_7002.xzDic[i][j].Length; k++) { - if(Score_7002.xzDic[i][j][k]) + if (Score_7002.xzDic[i][j][k]) { - GetControl("t" + i + "_" + j + "_" + k).isOn = true; + GetControl("t" + i + "_" + j + "_" + k).isOn = isSwitch; } } } } - for (int j = 1; j <= Score_7002.xzDic[2].Count; j++) - { - for (int k = 0; k < Score_7002.xzDic[2][j].Length; k++) - { - GetControl("t2_" + j + "_" + k).enabled = Player10007_7002.isNearCDZ; - } - } } protected override void OnChangeToggle(string toogleName, bool isOn) { @@ -87,7 +104,7 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel if (Score_7002.cdzIndex == 2) { ScoreManager.instance.Check(triggerName, "2"); - if(GameManager.RunModelMgr.ModeType == E_ModeType.Practice) + if (GameManager.RunModelMgr.ModeType == E_ModeType.Practice) { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => { @@ -105,7 +122,7 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel GameManager.UIMgr.HidePanel(); GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("ֳ", true); } - + break; case "Button_Close": @@ -183,5 +200,5 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel ClearInputFieldsInChildren(child); } } - + } diff --git a/Assets/Template.meta b/Assets/Template.meta new file mode 100644 index 0000000..9045dd2 --- /dev/null +++ b/Assets/Template.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccc531d3400e913498e4da6bf2f299ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/ArtRes.meta b/Assets/Template/ArtRes.meta new file mode 100644 index 0000000..e7e136d --- /dev/null +++ b/Assets/Template/ArtRes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6868b9fc25494e9428751c363bf6c529 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d8245d18ab1fcf8c89ceb06050420e85c905c1ec GIT binary patch literal 3165 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 DwC&zC literal 0 HcmV?d00001 diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png.meta b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png.meta new file mode 100644 index 0000000..6f29927 --- /dev/null +++ b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-悬浮@1x.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: fb4d268ee32d7364bb265a735f4ad453 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4d589e81b26c927c683d49a62f585b896d31faeb GIT binary patch literal 2915 zcmV-p3!LPx#1am@3R0s$N2z&@+hyVZ!4M{{nRCt{2Tzza*RTlr9bMH($6Nq7{jk1;v_%VvH zRze~ouvEJyZbGv*iX`}f2GIo9jWxIuT?7^*9|nUT$x1dXn39Np6jPJ^ho;pSiPs`Grwdq@8iCA-<$KBbIv{YoJ%r%^oI{QnhzOx7>;gp) z2<4n7Lrw%P5CnlY8G$Moq1kYQ`YWNxUt5EyC#V#6%P2rxhh zg%g2u>PHz)kqZPa>&-&#w|6%FUn`&>p^%qdp*;ikk zc>nq5?|u8}r|&9kvw6je+b8p&A zKth_2NUADa@p+Op*I&N?0N~u;F4uPR#|J@vF+pME#w2E(L&{ z2M%-`>+bIVX#M)7_syMK|IngEovBr;-iWSUQCnN}`}+EO$MbBh>2&&)y?fK+e5ES~ zV-!RL=RnM=&Jp5P;Sk271cd=dPl!n10^~!~;s&CU0P<{`V7$9#&4TfqdovVrwExQ9 zz3GP*E$XbQs7P&o{PCJs_U=vp^V@F^&Aai&1@-giS9Kge-nXQ>y6*e_{?pIA{q`V& zU47M6iRxLi?jFzco;r7~55U9`0`RgU^0OI43UNMasib+!A98@u*RAn){_+YgT+C7C zf8PYpFR8TgGY|E)Nk0(GTuJ_XD|;;XBiWPu1T#W z#0|s749XG)v6$6lxj}hZEc@&;o9*Dc2mqJ=8Z>t?sM*Aj0RRpjIWp|W{mtCD^`o8Z z>gnk(+|LF<=Btw@JI2!2Ei-4{5w|uO?H}vz&g^Jz?gW4@cJ6$l=j_?O(S*IEx;g~_ z-)AzJvGjGtA)u!vTyS?;#qZcyYsw8Ocit5%7W<>3AfpgNF~d0zm!z`Bks2T)B3%`(%S4 zv$3h^-Ghe@w@ytahY_MZo$h=1_1Cw*|H2E;URP0(+P`ky+Q#?Zd$*~rt!sR5ReYE< zgt(j#0pRbOHfMB`CW77)ZIUCUaF7~Q_9PS5ot1D(h#EO+_}tmy}g43R5@*0RovQS zHV863XU~rM@9a5uZjjn;PpA9Z)9E}RzTLfh?R6Cusnh4rcfEPwzz30^Fc#eN(n}vS zHZ*kXXm0LoY-mU=sjg1dZ`jb1EHA&LHY-+48bUO+wRJVMwQY~~YinwzM;hUGn>KB1 zPpA8Cm@y-{WA*AfV7Na~cy1^n&CqfDc*m0J>Qv+qMrho%tMyoS_lUkgZB5PeCDqlb zmmYrjiD(2zqmj`t+WD%=%Fhc4@yI>*R4rS)_>Mv|0|4KhKHd4@r=PZV_4M>7%gTNR zCc{sJ3{S@-qWnmMnI?Lq(Y9sF@~MeL#lKFR_`FaPG_|#L-9K+$OT)s2%U^xuku@DB zPHc?G($&+`|MH$a+ef-zHy$)cX!vm7hkNKnoK6A zl$R$9?RMPShTcom(F< z@qvX4mygsgI{(Xxid5r+52kiBH-9sKhSxMUG~Bdo(V_(aFm3A8ikP*@-t*_Xj-5KyKM}uG9%c+_3X$ydlUp2K#PAt5 zV1G;tv_qlUm>}$HZ|~Z%diCj3XU}%^U%Z(4;lhRfQ)kZfozG-4XMgx1^VP|decfly zWV(8LGjBZgRNa!>ZmYZg+G{HS3?sypWHNEz9e3n?hEI+jZ5`_~jC8!?`0>8Yk3E*3 z=g0;@X5F4Wmz`|;Nl<7mRLRRb%D@hfha4cB>DKr=yZ(d=7jo2pF+lc$LoOTOLQZ_5 z%ta+-$!mrpndG`0W>;1w0pLVW&xkgBc4cL9X*e(O@fTlojn-~FSh09<6##UfIg@Gs z^2_2FT|{Is21>%PWdvgw$^1LT{d;52O{PBS1xB~CB@3YUoyOQ_2Vqhi}Az15W9OYN$ zi*|^Ffq{&vJQ#+>?st{_a+Hoj2DpkV5o2Yr=LWZ)qivBE+f@?d~S+Z)a0 z7;J=8xm4^s84<&!ihU7_QCRG2!E9h+1_1nW0G9J5;UWSs3mX=QV=XNQFgY=n)EeBxjfKwm=ArKMEr3FJKD}LmHAs_;kmK6G#;zuqi^j|!I%o*U6c=P}O N002ovPDHLkV1g!XY8(In literal 0 HcmV?d00001 diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png.meta b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png.meta new file mode 100644 index 0000000..09018fe --- /dev/null +++ b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/去学习-默认@1x.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 1fb4a35457b5f054ebf38ed7faef6e21 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..e2aaab805f14ebc5096196a4eb5b0ab4021d4b5a GIT binary patch literal 4062 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 QQUCw|07*qoM6N<$f;Uc}A^-pY literal 0 HcmV?d00001 diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png.meta b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png.meta new file mode 100644 index 0000000..4e42192 --- /dev/null +++ b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-悬浮@1x.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 591890531ab45c94e854151ef5a98b64 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-默认@1x.png b/Assets/Template/ArtRes/Sprite/UI_Panel/UI_PracticeCompletedPanel/重新练习-默认@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..798c03630959191020559316c34f4f49c7ba696c GIT binary patch literal 3808 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 WDn`(>&x#8G0000 }); }); } + + /// + /// 学习调用 + /// + public void Study() + { + ResetStateAndEvent(); + RunModelMgr.ModeType = E_ModeType.Study; + EventMgr.EventTrigger(Enum_EventType.SwitchMode); + ProcessMgr.Init(RunModelMgr.schemeID); + UIMgr.ShowPanel(E_UI_Layer.System, (panel) => + { + panel.Init(); + EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); + ScenesMgr.LoadSceneAsyn($"{systemId}_{RunModelMgr.schemeID}_03_OfficeScene", () => + { + if (UIMgr.GetPanel()) + UIMgr.HidePanel(); + if (UIMgr.GetPanel()) + UIMgr.HidePanel(); + EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); + }); + }); + } + /// /// 清除一些动态 /// diff --git a/Assets/Template/Scripts/Project/Manager/NetManager.cs b/Assets/Template/Scripts/Project/Manager/NetManager.cs index 574f52b..c53406f 100644 --- a/Assets/Template/Scripts/Project/Manager/NetManager.cs +++ b/Assets/Template/Scripts/Project/Manager/NetManager.cs @@ -295,11 +295,11 @@ public class NetManager : BaseManager JObject jo = JObject.Parse(result); if (jo["code"].ToObject() == 200) { - TipPanel.ShowTip("上传分数成功"); + //TipPanel.ShowTip("上传分数成功"); } else { - TipPanel.ShowTip("上传分数失败；" + jo["msg"].ToString()); + //TipPanel.ShowTip("上传分数失败；" + jo["msg"].ToString()); } })); } diff --git a/Assets/Template/Scripts/Project/Manager/OfficeManager.cs b/Assets/Template/Scripts/Project/Manager/OfficeManager.cs index 20e0d0e..8d76dab 100644 --- a/Assets/Template/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Template/Scripts/Project/Manager/OfficeManager.cs @@ -13,6 +13,7 @@ public class OfficeManager : SingletonMono /// ֻ /// public MobileController mobileController; + public MobileAttach10007_7002 mobileAttch10007; private FirstPersonController firstPersonController; private void Start() { diff --git a/Assets/Template/Scripts/Project/Objects/Other/OfficeTimelineControl.cs b/Assets/Template/Scripts/Project/Objects/Other/OfficeTimelineControl.cs index 0392eea..d82abab 100644 --- a/Assets/Template/Scripts/Project/Objects/Other/OfficeTimelineControl.cs +++ b/Assets/Template/Scripts/Project/Objects/Other/OfficeTimelineControl.cs @@ -12,12 +12,14 @@ public class OfficeTimelineControl : MonoBehaviour public GameObject playerModel; //public GameObject playerController; public GameObject aniCamera; - + private Transform door; // Start is called before the first frame update private async void Start() { + door = transform.GetChild(0); await Task.Delay(1); mPlayableDirector = GetComponent(); + door.localEulerAngles = new Vector3(0f, 62.853f, 0f); if (!GameManager.RunModelMgr.isOnceOfficeAni) { mPlayableDirector.Play(); @@ -31,13 +33,15 @@ public class OfficeTimelineControl : MonoBehaviour } private void Update() { +#if UNITY_EDITOR if (Input.GetKeyDown("p")) { mPlayableDirector.Stop(); DestroyPlayer(); } +#endif } - + /// /// 外挂到场景中得timeline /// @@ -50,6 +54,7 @@ public class OfficeTimelineControl : MonoBehaviour private void DestroyPlayer() { GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI); + door.localEulerAngles = new Vector3(0f, -90f, 0f); Destroy(playerModel); Destroy(aniCamera); mPlayableDirector.Stop(); diff --git a/Assets/Template/Scripts/Project/UI/UI_Item/UI_PracticeInfoItem.cs b/Assets/Template/Scripts/Project/UI/UI_Item/UI_PracticeInfoItem.cs index 28227e2..f2e6d81 100644 --- a/Assets/Template/Scripts/Project/UI/UI_Item/UI_PracticeInfoItem.cs +++ b/Assets/Template/Scripts/Project/UI/UI_Item/UI_PracticeInfoItem.cs @@ -19,14 +19,14 @@ public class UI_PracticeInfoItem : BaseItem { pointData = $"{ sInfo.stepName}"; pointInfoData = $"{sInfo.testPoint}"; - scoreData = $"{sInfo.testPoint}/{sInfo.defaultScore}"; + scoreData = $"{sInfo.setScore}/{sInfo.defaultScore}"; } else { pointData = sInfo.stepName; pointInfoData = sInfo.testPoint; - scoreData = $"{sInfo.testPoint}/{sInfo.defaultScore}"; + scoreData = $"{sInfo.setScore}/{sInfo.defaultScore}"; } point.text = pointData; pointInfo.text = pointInfoData; diff --git a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs index 1a91774..6cd971d 100644 --- a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs +++ b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs @@ -94,9 +94,7 @@ public class UI_MainTitlePanel : BasePanel private void SwitchUserName() { - var userName = GameManager.ProcessMgr.userData.userName; - //GetControl("userNameText (TMP)").text = userName; - GetControl("userNameText (TMP)").text = "考生姓名：张三三三"; + GetControl("userNameText (TMP)").text = $"考生姓名:{GameManager.NetMgr.userName}"; } /// diff --git a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_PracticeCompletedPanel.cs b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_PracticeCompletedPanel.cs index 78d6678..ee5f4ab 100644 --- a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_PracticeCompletedPanel.cs +++ b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_PracticeCompletedPanel.cs @@ -35,43 +35,36 @@ public class UI_PracticeCompletedPanel : BasePanel base.HideMe(); GameManager.EventMgr.EventTrigger(Enum_EventType.PlayerCanMove, true); } + + public void ResetPractice() + { + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => + { + p.Init("ʾ", "Ƿϰ", E_MessageType.Error, () => + { + GameManager.Instance.Practice(); + GameManager.UIMgr.HidePanel(); + }); + }); + } + protected override void OnClick(string btnName) { switch (btnName) { case "restartBtn": - GameManager.Instance.Practice(); - //GameManager.ProcessMgr.Init(GameManager.RunModelMgr.schemeID, GameManager.RunModelMgr.ModeType); - //GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => - //{ - // //GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => - // //{ - // // panel.Init(); - // //}); - - // panel.Init(); - // GameManager.EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); - // GameManager.ScenesMgr.LoadSceneAsyn($"{GameManager.Instance.systemId}_{GameManager.RunModelMgr.schemeID}_03_OfficeScene", () => - // { - // GameManager.UIMgr.HidePanel(); - // GameManager.UIMgr.HidePanel(); - // GameManager.EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); - // if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) - // { - // GameManager.RunModelMgr.startTime = DateTime.Now; - // Debug.Log("ʼʱ" + GameManager.RunModelMgr.startTime.ToString()); - // } - // }); - //}); + GameManager.Instance.Study(); + GameManager.UIMgr.HidePanel(); + break; + case "repracticeBtn": + ResetPractice(); break; case "backBtn": GameManager.Instance.ShowUIPanelAndLoadScene(true); - break; - case "closeBtn": + GameManager.UIMgr.HidePanel(); break; default: break; } - GameManager.UIMgr.HidePanel(); } } diff --git a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs index 10e3970..bae5d09 100644 --- a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs +++ b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TaskListPanel.cs @@ -52,7 +52,6 @@ public class UI_TaskListPanel : BasePanel /// 0 δвת1 вת public void ClickFirstSubProcessesItem(int state, Action _cancelCallback = null) { - Debug.LogError("@@@"+ state); if (_content.GetChild(0).GetComponent()) { _content.GetChild(0).GetComponent().OnResetClick(true, state, state == 1 ? _cancelCallback : null); diff --git a/Assets/Template/Standard.meta b/Assets/Template/Standard.meta new file mode 100644 index 0000000..39d6a4d --- /dev/null +++ b/Assets/Template/Standard.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf34ebc852e9c9f458b696cb22de966e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/TextMesh Pro.meta b/Assets/Template/TextMesh Pro.meta new file mode 100644 index 0000000..81f8ee5 --- /dev/null +++ b/Assets/Template/TextMesh Pro.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62d9184e2eec14d438abcc559e87f0a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Template/Tree_Textures.meta b/Assets/Template/Tree_Textures.meta new file mode 100644 index 0000000..46ff832 --- /dev/null +++ b/Assets/Template/Tree_Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f14cadf0ccc90954588b9963523d9c72 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/new_10007_YanCheng_Metrology.sln b/new_10007_YanCheng_Metrology.sln new file mode 100644 index 0000000..e88553d --- /dev/null +++ b/new_10007_YanCheng_Metrology.sln @@ -0,0 +1,86 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniRx", "UniRx.csproj", "{04933ACD-67D0-967F-5ED4-A3E01DE821AA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{DD6B8BA8-E309-EA46-FF6E-5867B0DE6B57}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{51DC1BFD-04E8-4D18-B1D0-BFE4658C59C7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{EDFC0BC0-BE55-1DFA-C8ED-2E91E75F1D91}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{AA2CABE2-1FED-9054-FCEE-15A11CE5C314}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{9120F05B-BCD4-A0EC-573C-85E006317B93}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{01A45A7A-DAB4-992A-BA5A-4CFF17AAC845}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{AAC48AF5-6C89-1E1C-38D8-7A221DBC8793}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{3E44EBC3-79B6-B544-6C83-D720B8A0A170}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{65DE1E6F-9698-466C-D5CC-8A7FD07B7DFC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{7FE66E06-19F6-4AE2-4C42-1666441BEE6F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sirenix.OdinInspector.Modules.UnityMathematics", "Sirenix.OdinInspector.Modules.UnityMathematics.csproj", "{7993B562-2FBA-ED8A-0E5B-219DA286BE1A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {04933ACD-67D0-967F-5ED4-A3E01DE821AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04933ACD-67D0-967F-5ED4-A3E01DE821AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04933ACD-67D0-967F-5ED4-A3E01DE821AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04933ACD-67D0-967F-5ED4-A3E01DE821AA}.Release|Any CPU.Build.0 = Release|Any CPU + {DD6B8BA8-E309-EA46-FF6E-5867B0DE6B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD6B8BA8-E309-EA46-FF6E-5867B0DE6B57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD6B8BA8-E309-EA46-FF6E-5867B0DE6B57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD6B8BA8-E309-EA46-FF6E-5867B0DE6B57}.Release|Any CPU.Build.0 = Release|Any CPU + {51DC1BFD-04E8-4D18-B1D0-BFE4658C59C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51DC1BFD-04E8-4D18-B1D0-BFE4658C59C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51DC1BFD-04E8-4D18-B1D0-BFE4658C59C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51DC1BFD-04E8-4D18-B1D0-BFE4658C59C7}.Release|Any CPU.Build.0 = Release|Any CPU + {EDFC0BC0-BE55-1DFA-C8ED-2E91E75F1D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EDFC0BC0-BE55-1DFA-C8ED-2E91E75F1D91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EDFC0BC0-BE55-1DFA-C8ED-2E91E75F1D91}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EDFC0BC0-BE55-1DFA-C8ED-2E91E75F1D91}.Release|Any CPU.Build.0 = Release|Any CPU + {AA2CABE2-1FED-9054-FCEE-15A11CE5C314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA2CABE2-1FED-9054-FCEE-15A11CE5C314}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA2CABE2-1FED-9054-FCEE-15A11CE5C314}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA2CABE2-1FED-9054-FCEE-15A11CE5C314}.Release|Any CPU.Build.0 = Release|Any CPU + {9120F05B-BCD4-A0EC-573C-85E006317B93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9120F05B-BCD4-A0EC-573C-85E006317B93}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9120F05B-BCD4-A0EC-573C-85E006317B93}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9120F05B-BCD4-A0EC-573C-85E006317B93}.Release|Any CPU.Build.0 = Release|Any CPU + {01A45A7A-DAB4-992A-BA5A-4CFF17AAC845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01A45A7A-DAB4-992A-BA5A-4CFF17AAC845}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01A45A7A-DAB4-992A-BA5A-4CFF17AAC845}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01A45A7A-DAB4-992A-BA5A-4CFF17AAC845}.Release|Any CPU.Build.0 = Release|Any CPU + {AAC48AF5-6C89-1E1C-38D8-7A221DBC8793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAC48AF5-6C89-1E1C-38D8-7A221DBC8793}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAC48AF5-6C89-1E1C-38D8-7A221DBC8793}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAC48AF5-6C89-1E1C-38D8-7A221DBC8793}.Release|Any CPU.Build.0 = Release|Any CPU + {3E44EBC3-79B6-B544-6C83-D720B8A0A170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E44EBC3-79B6-B544-6C83-D720B8A0A170}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E44EBC3-79B6-B544-6C83-D720B8A0A170}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E44EBC3-79B6-B544-6C83-D720B8A0A170}.Release|Any CPU.Build.0 = Release|Any CPU + {65DE1E6F-9698-466C-D5CC-8A7FD07B7DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65DE1E6F-9698-466C-D5CC-8A7FD07B7DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65DE1E6F-9698-466C-D5CC-8A7FD07B7DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65DE1E6F-9698-466C-D5CC-8A7FD07B7DFC}.Release|Any CPU.Build.0 = Release|Any CPU + {7FE66E06-19F6-4AE2-4C42-1666441BEE6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FE66E06-19F6-4AE2-4C42-1666441BEE6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FE66E06-19F6-4AE2-4C42-1666441BEE6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FE66E06-19F6-4AE2-4C42-1666441BEE6F}.Release|Any CPU.Build.0 = Release|Any CPU + {7993B562-2FBA-ED8A-0E5B-219DA286BE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7993B562-2FBA-ED8A-0E5B-219DA286BE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7993B562-2FBA-ED8A-0E5B-219DA286BE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7993B562-2FBA-ED8A-0E5B-219DA286BE1A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal