WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
陈向学 2024-09-05 15:10:22 +08:00
parent 8f905f2787 53059fe795
commit bf1eacad77
8 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab
View File

@ -112,7 +112,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 503926570506812806}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.061267853, y: 0.020126343, z: -0.10964799}
m_LocalPosition: {x: 0.061267853, y: 0.07292634, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -773,7 +773,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 811983711441613308}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.0001373291, y: -0.049438477, z: 0.091278076}
m_LocalPosition: {x: -0.0001373291, y: 0.0033615232, z: 0.091278076}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -2695,7 +2695,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2537738450205131575}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.06092453, y: 0.020126343, z: -0.10964799}
m_LocalPosition: {x: -0.06092453, y: 0.07292634, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -3668,7 +3668,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2638763987231761498}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.06092453, y: 0.020126343, z: -0.10964799}
m_LocalPosition: {x: -0.06092453, y: 0.07292634, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -4524,7 +4524,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3491577929125647534}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0.0528, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -6988,7 +6988,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4689876117537848694}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.069568634, y: 0.02281189, z: -0.021592975}
m_LocalPosition: {x: -0.069568634, y: 0.07561189, z: -0.021592975}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -7272,7 +7272,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4920122536138912573}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.015167236, y: 0.025436401, z: 0.030426025}
m_LocalPosition: {x: -0.015167236, y: 0.0782364, z: 0.030426025}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -7933,7 +7933,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5739074963520473130}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.040023804, y: 0.02696228, z: 0.037261963}
m_LocalPosition: {x: 0.040023804, y: 0.07976228, z: 0.037261963}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -8004,7 +8004,7 @@ GameObject:
- component: {fileID: 2576541080985544079}
- component: {fileID: 2576541080985544080}
- component: {fileID: 2576541080985544078}
m_Layer: 8
m_Layer: 10
m_Name: "\u7535\u80FD\u8868\u76D6\u5B50"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -8019,7 +8019,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6044607018453959887}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.00012207031, y: -0.011123657, z: -0.09854126}
m_LocalPosition: {x: -0.00012207031, y: 0.041676342, z: -0.09854126}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -8087,7 +8087,7 @@ MeshCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 3704420492699352537, guid: 3022de55b8046f04485b93331386de5f, type: 3}
--- !u!114 &2576541080985544080
@ -8982,7 +8982,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6764219220802548366}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.039993286, y: 0.02696228, z: 0.048858643}
m_LocalPosition: {x: 0.039993286, y: 0.07976228, z: 0.048858643}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -9065,7 +9065,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6776581396377010381}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.00012207031, y: -0.011383057, z: -0.011633396}
m_LocalPosition: {x: -0.00012207031, y: 0.041416943, z: -0.011633396}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -10225,7 +10225,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7847778419808227353}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.012374878, y: 0.02468872, z: 0.066101074}
m_LocalPosition: {x: -0.012374878, y: 0.07748872, z: 0.066101074}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -10936,7 +10936,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8569168921652152456}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.061267853, y: 0.020126343, z: -0.10964799}
m_LocalPosition: {x: 0.061267853, y: 0.07292634, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

22
Assets/Scenes/03_OfficeScene.unity
View File

@ -295,22 +295,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
--- !u!1 &267617285 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2399593117452945565, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 267617284}
m_PrefabAsset: {fileID: 0}
--- !u!114 &267617286 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2399593117452945567, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 267617284}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267617285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d90ba6530d9bfda47abb4610956b2f44, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &772251462
GameObject:
m_ObjectHideFlags: 0
@ -504,7 +488,7 @@ Transform:
- {fileID: 2089319124}
- {fileID: 772251465}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1411090332
MonoBehaviour:
@ -518,7 +502,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5436cda1c4b71f044bcd6efe54bbfc28, type: 3}
m_Name:
m_EditorClassIdentifier:
playerController: {fileID: 267617285}
aniCamera: {fileID: 772251462}
--- !u!114 &1411090333
MonoBehaviour:
@ -837,7 +820,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1986188606
MonoBehaviour:
@ -852,7 +835,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mobileController: {fileID: 919132148358585193}
firstPersonController: {fileID: 267617286}
--- !u!1 &2077977345
GameObject:
m_ObjectHideFlags: 0

3
Assets/Scripts/Project/Manager/LiveSceneManager.cs
View File

@ -83,7 +83,8 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
if (currentTool.name.Equals("三相四线电能表"))
{
tMDTips.gameObject.SetActive(false);
currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180);
currentTool.transform.localPosition = new Vector3(currentTool.transform.localPosition.x, currentTool.transform.localPosition.y, currentTool.transform.localPosition.z + 0.1f);
currentTool.transform.localEulerAngles = new Vector3(-90, 180, -180);
}
}

4
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -8,13 +8,13 @@ using UnityEngine;
/// </summary>
public class OfficeManager : SingletonMono<OfficeManager>
{
/// <summary>
/// ÊÖ»ú
/// </summary>
public MobileController mobileController;
private FirstPersonController firstPersonController;
protected override void Awake()
private void Start()
{
firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
firstPersonController.gameObject.SetActive(false);

8
Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs
View File

@ -33,9 +33,11 @@ public class UI_DisassemblyAssemblyNoticePanel : BasePanel
GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
break;
case "Button_Define":
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
ScoreManager.instance.Check(triggerName, null);
GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
ScoreManager.instance.Check(triggerName, null);
GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
}
break;
}
}

14
Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs
View File

@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Playables;
@ -13,16 +14,15 @@ public class OfficeTimelineControl : MonoBehaviour
public GameObject aniCamera;
// Start is called before the first frame update
void Start()
private async void Start()
{
await Task.Delay(1);
mPlayableDirector = GetComponent<PlayableDirector>();
if (!GameManager.RunModelMgr.isOnceOfficeAni)
{
//playerController.SetActive(false);
mPlayableDirector.Stop();
//mPlayableDirector.stopped += OnPlayableDirectorStopped;
playerModel = transform.GetChild(0).gameObject;
StartTimeline();
StartTimeline();
GameManager.RunModelMgr.isOnceOfficeAni = true;
}
else
@ -43,7 +43,9 @@ public class OfficeTimelineControl : MonoBehaviour
{
mPlayableDirector.Play();
}
/// <summary>
/// 外挂到场景中得timeline
/// </summary>
public void OnPlayableDirectorStopped()
{
GameManager.EventMgr.EventTrigger(Enum_EventType.OfficeTimeLineOver);
@ -52,10 +54,10 @@ public class OfficeTimelineControl : MonoBehaviour
private void DestroyPlayer()
{
GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
Destroy(playerModel);
Destroy(aniCamera);
//playerController.SetActive(true);
GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
}
void OnDestroy()

2
ProjectSettings/DynamicsManager.asset
View File

@ -18,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: fffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffff9fffffff8ffff7ef8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1

2
ProjectSettings/TagManager.asset
View File

@ -16,7 +16,7 @@ TagManager:
- Tool
- Deveice
- Player
-
- Shell
-
-
-