CYT
/
FireDrillSystem_BeiHai_HANCC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调成场景，灾情库加载不同步旋转信息问题修改，选中物体后切层后其他克隆物体不隐藏问题修改

develop
曹衍涛 3 years ago
parent
486f6736d9
commit
d0d13d07a8
6 changed files with 432 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      Assets/HeAnNingChunCheng/Prefab/SceneAll.prefab
  2. 18
      Assets/MscPublic/Assets/Scripts/MainScene/FloorControlModule/UIFloor.cs
  3. 260
      Assets/Scenes/DongYouLiQing.unity
  4. 112
      Assets/Scripts/Common/DisasterLibrary/DisasterLoad.cs
  5. 4
      Assets/Scripts/Common/GameObjectCtrl/ObjRotate.cs
  6. 3
      Assets/Scripts/Common/NetworkSystem/NetWorkSync/OBJ_ROTATE_SYNC.cs

98
Assets/HeAnNingChunCheng/Prefab/SceneAll.prefab
Unescape View File

@ -16504,12 +16504,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1040988661576692}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -40.36003, y: 0.05869907, z: 105.68112}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -26.65092, y: -66.79616, z: -6.2818527}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 4
m_Father: {fileID: 4511168364797032}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33644326535084170
MeshFilter:
@ -32763,6 +32763,14 @@ Transform:
- {fileID: 4176552152531766}
- {fileID: 4996892205051220}
- {fileID: 4558433144014738}
- {fileID: 4194410601233008}
- {fileID: 4739291800709938}
- {fileID: 4896817081617872}
- {fileID: 4658944794356948}
- {fileID: 4971837667245352}
- {fileID: 4467820101676218}
- {fileID: 4888969844394700}
- {fileID: 4210211401675532}
m_Father: {fileID: 4844121163013897406}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -38060,7 +38068,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 14
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33880790883521988
MeshFilter:
@ -55148,12 +55156,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1136738144382968}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 2.934639, y: 0.09946293, z: 107.38733}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 16.64375, y: -68.502365, z: -6.241089}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 5
m_Father: {fileID: 4511168364797032}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33268724043924242
MeshFilter:
@ -81156,7 +81164,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 10
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33421977488943002
MeshFilter:
@ -171132,12 +171140,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1440499396168442}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -71.1229, y: 0.04414028, z: 16.512894}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -57.41379, y: 22.37208, z: -6.296402}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 1
m_Father: {fileID: 4511168364797032}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33918315260368814
MeshFilter:
@ -191749,12 +191757,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1491956959751416}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -53.967644, y: 0.033281744, z: 94.72832}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -40.258533, y: -55.843353, z: -6.30727}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 3
m_Father: {fileID: 4511168364797032}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33586457002978934
MeshFilter:
@ -214769,12 +214777,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1549294577223192}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -63.78068, y: 0.033258855, z: 65.98165}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -50.07157, y: -27.096684, z: -6.307289}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 2
m_Father: {fileID: 4511168364797032}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33737993599326430
MeshFilter:
@ -224788,7 +224796,7 @@ Transform:
m_LocalScale: {x: 0.655593, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 16
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33279973803600754
MeshFilter:
@ -242259,7 +242267,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 8
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33631296072759300
MeshFilter:
@ -259748,7 +259756,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 11
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33856733454322332
MeshFilter:
@ -292331,7 +292339,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 15
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33046115809959716
MeshFilter:
@ -296922,12 +296930,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1754446217231146}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 37.978077, y: 0.09946293, z: 107.38733}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 51.687187, y: -68.502365, z: -6.241089}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 7
m_Father: {fileID: 4511168364797032}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33755860583802796
MeshFilter:
@ -322796,12 +322804,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1821214976953908}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 27.862423, y: 0.09946293, z: 107.38733}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 41.571533, y: -68.502365, z: -6.241089}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 6
m_Father: {fileID: 4511168364797032}
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33638031353981642
MeshFilter:
@ -376875,14 +376883,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4194410601233008}
- {fileID: 4739291800709938}
- {fileID: 4896817081617872}
- {fileID: 4658944794356948}
- {fileID: 4971837667245352}
- {fileID: 4467820101676218}
- {fileID: 4888969844394700}
- {fileID: 4210211401675532}
- {fileID: 4382030748687562}
- {fileID: 4520365567431136}
- {fileID: 4868663782984708}
@ -380801,7 +380801,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 9
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33009762809656260
MeshFilter:
@ -391922,7 +391922,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 13
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33012494311184068
MeshFilter:
@ -392711,12 +392711,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1987273053880082}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -72.20676, y: 0.039877355, z: -3.6428452}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -58.497646, y: 42.52782, z: -6.300663}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 0
m_Father: {fileID: 4511168364797032}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33204892012823742
MeshFilter:
@ -393127,7 +393127,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4579001247121282}
m_RootOrder: 12
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33114674988673998
MeshFilter:

18
Assets/MscPublic/Assets/Scripts/MainScene/FloorControlModule/UIFloor.cs
Unescape View File

@ -96,7 +96,12 @@ public class UIFloor : BaseToggle
}
foreach (var item in floorsPanelManager.AllWai)
{
item.gameObject.SetActive(true);
Renderer[] renderers = item.GetComponentsInChildren<Renderer>();
for (int i = 0; i < renderers.Length; i++)
{
renderers[i].enabled = true;
}
//item.gameObject.SetActive(true);
}
ShowCloneObj();
}
@ -109,7 +114,12 @@ public class UIFloor : BaseToggle
{
if (item.buildNum == data.buildNum && item.floorNum > data.floorNum && Mathf.Abs(item.floorNum) > 0)
{
item.gameObject.SetActive(false);
Renderer[] renderers = item.GetComponentsInChildren<Renderer>();
for (int i = 0; i < renderers.Length; i++)
{
renderers[i].enabled = false;
}
//item.gameObject.SetActive(false);
}
}
@ -139,7 +149,7 @@ public class UIFloor : BaseToggle
}
if (MyTarget != null/* && floorNum == 0*/)//镜头拉近
{
cameraManager.SetCameraView(MyTarget.position, FollowCameraDistance,-110,52);
cameraManager.SetCameraView(MyTarget.position, FollowCameraDistance,50,52);
}
//if (RecordData.isRecording())
//{
@ -206,7 +216,7 @@ public class UIFloor : BaseToggle
{
if (objs[i].gameObject == SelectedObjs.selectedObj || SelectedObjs.selectedCharacters.Contains( objs[i].gameObject))
{
break;
continue;
}
//if (string.IsNullOrEmpty(objs[i].buildNum))
//{//克隆在地面上的物体

260
Assets/Scenes/DongYouLiQing.unity
Unescape View File

@ -2237,8 +2237,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1466}
m_LocalRotation: {x: 0.11886275, y: -0.79958373, z: 0.16849874, w: 0.5640441}
m_LocalPosition: {x: 157.1094, y: 96.30111, z: 92.336334}
m_LocalRotation: {x: 0.07630722, y: 0.561117, z: -0.05205328, w: 0.8225664}
m_LocalPosition: {x: -157.00594, y: 44.6879, z: -26.327286}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6016}
@ -141192,6 +141192,57 @@ MonoBehaviour:
id: 6855563786410003309
- component: {fileID: 742683463}
id: 6855563786410003310
--- !u!1 &743232371
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 743232373}
- component: {fileID: 743232372}
m_Layer: 0
m_Name: NavMesh Link (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &743232372
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 743232371}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AgentTypeID: 0
m_StartPoint: {x: -2.3174858, y: -0.99526405, z: -0.5361767}
m_EndPoint: {x: -0.12558365, y: 0, z: 0.14755821}
m_Width: 0
m_CostModifier: -1
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!4 &743232373
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 743232371}
m_LocalRotation: {x: -0, y: 0.17364825, z: -0, w: 0.9848078}
m_LocalPosition: {x: -67.53825, y: 18.24231, z: -46.400974}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1204615360}
m_RootOrder: 45
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &743553538 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1571303075197790, guid: 0eae1400396ce7543ada43bfc5909274,
@ -202262,6 +202313,57 @@ MonoBehaviour:
id: 7046572518345305814
- component: {fileID: 1024263662}
id: 7046572518345305815
--- !u!1 &1025296434
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1025296436}
- component: {fileID: 1025296435}
m_Layer: 0
m_Name: NavMesh Link (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1025296435
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025296434}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AgentTypeID: 0
m_StartPoint: {x: 0.7818146, y: -2.4429321, z: -2.0280151}
m_EndPoint: {x: -0.5194626, y: -1.4127197, z: 0.21224976}
m_Width: 0
m_CostModifier: -1
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!4 &1025296436
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1025296434}
m_LocalRotation: {x: -0, y: 0.17364825, z: -0, w: 0.9848078}
m_LocalPosition: {x: -74.3099, y: 19.609919, z: -34.7381}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1204615360}
m_RootOrder: 46
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1025358346 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1871059477078176, guid: 0eae1400396ce7543ada43bfc5909274,
@ -223897,6 +223999,10 @@ Transform:
- {fileID: 1867641933}
- {fileID: 599249310}
- {fileID: 1095362109}
- {fileID: 1863076376}
- {fileID: 1719125979}
- {fileID: 743232373}
- {fileID: 1025296436}
m_Father: {fileID: 0}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -224777,7 +224883,7 @@ PrefabInstance:
- target: {fileID: 224001330236392204, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000065581817
value: -0.000027035712
objectReference: {fileID: 0}
- target: {fileID: 224123732978855200, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -224817,7 +224923,7 @@ PrefabInstance:
- target: {fileID: 224171116340244144, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.0000353328
value: -0.00006567375
objectReference: {fileID: 0}
- target: {fileID: 224180419744436474, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -224842,7 +224948,7 @@ PrefabInstance:
- target: {fileID: 224181501778157638, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000027392118
value: 0.000072888026
objectReference: {fileID: 0}
- target: {fileID: 224373752534357086, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -224922,7 +225028,7 @@ PrefabInstance:
- target: {fileID: 224756375583235730, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000059497584
value: 0.000035791792
objectReference: {fileID: 0}
- target: {fileID: 224796681591186844, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -338776,6 +338882,57 @@ MonoBehaviour:
id: 7046572518345303935
- component: {fileID: 1718152061}
id: 7046572518345303936
--- !u!1 &1719125977
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1719125979}
- component: {fileID: 1719125978}
m_Layer: 0
m_Name: NavMesh Link (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1719125978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1719125977}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AgentTypeID: 0
m_StartPoint: {x: 1.0340462, y: 0, z: -0.29532337}
m_EndPoint: {x: 0.66728973, y: 0, z: 0.67923594}
m_Width: 0
m_CostModifier: -1
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!4 &1719125979
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1719125977}
m_LocalRotation: {x: -0, y: 0.17364825, z: -0, w: 0.9848078}
m_LocalPosition: {x: -50.13449, y: 74.80031, z: -39.36548}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1204615360}
m_RootOrder: 44
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1720080164 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1154010783590164, guid: 0eae1400396ce7543ada43bfc5909274,
@ -360159,6 +360316,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 274276876, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 274276876, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: floorNum
value: 23
objectReference: {fileID: 0}
- target: {fileID: 304071721, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
@ -360171,10 +360336,42 @@ PrefabInstance:
propertyPath: interlayerNum
value: 1
objectReference: {fileID: 0}
- target: {fileID: 695135977, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 695135977, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: floorNum
value: 23
objectReference: {fileID: 0}
- target: {fileID: 1028403996, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 1028403996, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: floorNum
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1108968591, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 1580302840, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 1580302840, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: floorNum
value: 23
objectReference: {fileID: 0}
- target: {fileID: 2079554600, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: buildNum
value: 2HANCC
objectReference: {fileID: 0}
- target: {fileID: 2079554600, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: floorNum
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1041021310143788, guid: 0eae1400396ce7543ada43bfc5909274, type: 3}
propertyPath: m_IsActive
value: 1
@ -474876,6 +475073,57 @@ MonoBehaviour:
id: 7046572518345315251
- component: {fileID: 1862635638}
id: 7046572518345315252
--- !u!1 &1863076374
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1863076376}
- component: {fileID: 1863076375}
m_Layer: 0
m_Name: NavMesh Link
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1863076375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1863076374}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6eeb5dc026fdf4b488bc7ae0138ab719, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AgentTypeID: 0
m_StartPoint: {x: -0.12295532, y: 0.43341446, z: 1.1079865}
m_EndPoint: {x: -0.3362608, y: 0, z: 2.048149}
m_Width: 0
m_CostModifier: -1
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!4 &1863076376
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1863076374}
m_LocalRotation: {x: -0, y: 0.17364825, z: -0, w: 0.9848078}
m_LocalPosition: {x: 6.436105, y: 80.33931, z: 25.463924}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1204615360}
m_RootOrder: 43
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1863326450 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1093527231490478, guid: 0eae1400396ce7543ada43bfc5909274,

112
Assets/Scripts/Common/DisasterLibrary/DisasterLoad.cs
Unescape View File

@ -269,6 +269,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
obj.GetComponent<SmokeCtrl>().smokeAttribute = SmokeDisaster.smokeAttribute;
@ -328,6 +339,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
@ -496,6 +518,17 @@ public class DisasterLoad : MonoBehaviour
NetworkManager.Default.SendAsync("SET_LIQUIP_HIDE_SYNC", obj.GetComponent<BaseGameObjInfo>().gameObjID);
}
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var argrotate = new ObjRotateSyncData();
argrotate.SendUserID = CurrentUserInfo.mySelf.Id;
argrotate.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
argrotate.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
argrotate.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
}
@ -545,6 +578,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.UserID = cloneGameObjInfo.UserID;
clonesync.HitObjID = Leak1Disaster.OilTankId;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
@ -603,6 +647,17 @@ public class DisasterLoad : MonoBehaviour
arg.gameObjID = cloneGameObjInfo.gameObjID;
arg.Level = Leak2Disaster.level;
NetworkManager.Default.SendAsync("SET_LEAK2_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var argrotate = new ObjRotateSyncData();
argrotate.SendUserID = CurrentUserInfo.mySelf.Id;
argrotate.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
argrotate.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
argrotate.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
}
@ -650,6 +705,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
}
@ -696,6 +762,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
}
@ -742,6 +819,17 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
@ -788,6 +876,16 @@ public class DisasterLoad : MonoBehaviour
clonesync.gameObjType = cloneGameObjInfo.gameObjType;
clonesync.UserID = cloneGameObjInfo.UserID;
NetworkManager.Default.SendAsync("CLONE_SINGLE_DISASTER_SYNC", clonesync);
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if (obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
@ -866,8 +964,20 @@ public class DisasterLoad : MonoBehaviour
data.SendUserID = CurrentUserInfo.mySelf.Id;
NetworkManager.Default.SendAsync("FORCIBLE_SCALE_SYNC", data);
}
//旋转同步,加载灾情导掉足同步克隆只同步了位置，没有同步旋转，所以要在同步一遍旋转
if(obj.GetComponent<OBJ_ROTATE_SYNC>())
{
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = obj.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = obj.transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
}
}
}
}

4
Assets/Scripts/Common/GameObjectCtrl/ObjRotate.cs
Unescape View File

@ -54,7 +54,7 @@ public class ObjRotate : MonoBehaviour {
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = gameObject.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = new Vector3(0, -Time.deltaTime * rotateSpeed, 0);
arg.rotate = transform.rotation.eulerAngles;//new Vector3(0, -Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}
@ -73,7 +73,7 @@ public class ObjRotate : MonoBehaviour {
var arg = new ObjRotateSyncData();
arg.SendUserID = CurrentUserInfo.mySelf.Id;
arg.gameObjID = gameObject.GetComponent<BaseGameObjInfo>().gameObjID;
arg.rotate = new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.rotate = transform.rotation.eulerAngles;//new Vector3(0, Time.deltaTime * rotateSpeed, 0);
arg.space = Space.World;
NetworkManager.Default.SendAsync("OBJ_ROTATE_SYNC", arg);
}

3
Assets/Scripts/Common/NetworkSystem/NetWorkSync/OBJ_ROTATE_SYNC.cs
Unescape View File

@ -21,7 +21,8 @@ public class OBJ_ROTATE_SYNC : NetworkMessageBehaviour
{
if (GetComponent<BaseGameObjInfo>().gameObjID==info.gameObjID)
{
transform.Rotate(info.rotate.x,info.rotate.y,info.rotate.z,info.space);
//transform.Rotate(info.rotate.x,info.rotate.y,info.rotate.z,info.space);
transform.eulerAngles = info.rotate;
}
}
}

Write Preview
Loading…
Cancel
Save