yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

This commit is contained in:
王志勋 2023-11-19 21:20:02 +08:00
parent 961d9153ad 7a54da8e07
commit ed3f3e25fc
23 changed files with 2118 additions and 3128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat vendored
View File

@ -32,8 +32,8 @@ Material:
- _dispStrength: 1
- _overBright: 1
m_Colors:
- _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
- _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}

8
Assets/GameAssets/Models/装饰模型/树木.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d174948813452c644abed14232cddd9a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 7099352370737318148}
- component: {fileID: 8730502543110765572}
- component: {fileID: 8730502543110765573}
m_Layer: 0
m_Layer: 12
m_Name: "\u5730\u9762\u65E0\u7EBF\u7535\u5E72\u6270"
m_TagString: AttackTarget
m_Icon: {fileID: 0}

2
Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
View File

@ -3043,7 +3043,7 @@ GameObject:
- component: {fileID: 3977472425108262599}
- component: {fileID: 916690897}
- component: {fileID: 916690898}
m_Layer: 0
m_Layer: 12
m_Name: "\u63A2\u6D4B\u96F7\u8FBE"
m_TagString: AttackTarget
m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0}

4
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
View File

@ -384,9 +384,9 @@ GameObject:
- component: {fileID: 1432105532577387308}
- component: {fileID: 3231389817124393935}
- component: {fileID: 6644830064356880066}
m_Layer: 9
m_Layer: 11
m_Name: "\u65E0\u4EBA\u673AList"
m_TagString: Untagged
m_TagString: WRJ
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

2
Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
View File

@ -9919,7 +9919,7 @@ GameObject:
- component: {fileID: 7615181139496386323}
- component: {fileID: 2145343005}
- component: {fileID: 2145343006}
m_Layer: 10
m_Layer: 12
m_Name: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0"
m_TagString: AttackTarget
m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0}

2
Assets/Resources/DeviceBtn/HuoPao.prefab
View File

@ -241,7 +241,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabItem: {fileID: 8265706090847111326, guid: 55f5fc1f13fe52f48a409cd71f54b8a1,
prefabItem: {fileID: 7615181139496386322, guid: 7abae14e48a106d4c8120d0eba515162,
type: 3}
model: {fileID: 0}
huoPaoCtrls:

2
Assets/Resources/DeviceBtn/LeiDa.prefab
View File

@ -163,7 +163,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabItem: {fileID: 502915126450753949, guid: e0436efb1635a104a8f07b3dbe7e77a1,
prefabItem: {fileID: 3977472425108262603, guid: 2b2524df6b4053a4aa08b1f5fe4d62f5,
type: 3}
model: {fileID: 0}
huoPaoCtrls:

2
Assets/Resources/DeviceBtn/WRJ.prefab
View File

@ -167,7 +167,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabItem: {fileID: 6865737300552731157, guid: 9524f4734fdef0048b8295dc5f53e2e3,
prefabItem: {fileID: 6865737300552731157, guid: 8425122cf585dcc47bbf3eff95ecf176,
type: 3}
model: {fileID: 0}
huoPaoCtrls:

4
Assets/Resources/Prefabs/EvaluatePanel.prefab
View File

@ -582,7 +582,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 401.10828}
m_AnchoredPosition: {x: 0, y: 254.06491}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7621630000060616885
@ -1727,7 +1727,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 3698306822714026186}
m_Direction: 2
m_Value: 1
m_Size: 1
m_Size: 0.5
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

8
Assets/StreamingAssets.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2867c644cac2f7b488d4acbc11bd2ea4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Temp/Scripts/Judgmentstate.cs
View File

@ -22,6 +22,8 @@ public class Judgmentstate : MonoBehaviour
public Button message_btn;//席位训练按钮
public Modellinkedlistpanl modellinkedlistpanl;//模型页面列表
public Button model2_btn;//模型列表按钮
public Button initiate_botn;//开始推演按钮
@ -74,6 +76,11 @@ public class Judgmentstate : MonoBehaviour
{
modellinkedlistpanl.gameObject.SetActive(true);
});
initiate_botn.onClick.AddListener(() =>
{
string msg = $"send2room " + "StartDeduction";
_ = SyncCreateRoom.SendMessageAsync(msg);
});
}
void Update()
@ -85,7 +92,7 @@ public class Judgmentstate : MonoBehaviour
if (a<=0)
{
countdown_text.gameObject.SetActive(false);
string msg = $"send2room " + "end";
string msg = $"send2room " + "EndDeduction";
_ = SyncCreateRoom.SendMessageAsync(msg);
//UnityEditor.EditorApplication.isPlaying = false;
//Application.Quit();//在可执行程序中结束运行

7
Assets/Temp/Scripts/View_Panel2.cs
View File

@ -491,8 +491,11 @@ public class View_Panel2 : XUIPanel
///进入导调
entering_key_btn.onClick.AddListener(() =>
{
GameMain.model = true;
SceneManager.LoadScene("Training_pilot_terminal_panl");
//GameMain.model = true;
//SceneManager.LoadScene("Training_pilot_terminal_panl");
string RoomName = "joinroom " + currentRoomName;
_ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
});
///想定编辑
scenario_btn.onClick.AddListener(() =>

4608
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

File diff suppressed because it is too large Load Diff

222
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 2.unity
View File

@ -5675,6 +5675,125 @@ Transform:
m_Father: {fileID: 1210165386}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &78139657
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 78139658}
- component: {fileID: 78139661}
- component: {fileID: 78139660}
- component: {fileID: 78139659}
m_Layer: 5
m_Name: initiate_botn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &78139658
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 78139657}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1779143264}
m_Father: {fileID: 284678593}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 800, y: 400}
m_SizeDelta: {x: 138, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &78139659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 78139657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 2
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 21300000, guid: 02f4d08c9858d234496c1131127f6df9, type: 3}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 78139660}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &78139660
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 78139657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7a62f982c6b82d0468dbeb46934c7b76, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &78139661
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 78139657}
m_CullTransparentMesh: 0
--- !u!1 &81847170
GameObject:
m_ObjectHideFlags: 0
@ -42217,6 +42336,10 @@ MonoBehaviour:
userIds:
tenkokuModule: {fileID: 1820978573}
modelsInfo: []
dviceContent: {fileID: 0}
wrjDrag: {fileID: 0}
ldDrag: {fileID: 0}
hpDrag: {fileID: 0}
--- !u!4 &1436809530
Transform:
m_ObjectHideFlags: 0
@ -53011,27 +53134,27 @@ PrefabInstance:
objectReference: {fileID: 317830999}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 75
objectReference: {fileID: 0}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -60
objectReference: {fileID: 0}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 110
objectReference: {fileID: 0}
- target: {fileID: 2058299518, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 80
objectReference: {fileID: 0}
- target: {fileID: 2108704405, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@ -53150,7 +53273,7 @@ PrefabInstance:
- target: {fileID: 1862065803563357529, guid: 67585a2b4d19db24ba6c09ffdf9d9d15,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 67585a2b4d19db24ba6c09ffdf9d9d15, type: 3}
@ -54081,6 +54204,84 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1779143263
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1779143264}
- component: {fileID: 1779143266}
- component: {fileID: 1779143265}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1779143264
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779143263}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_Children: []
m_Father: {fileID: 78139658}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00009918213, y: -0.000047683716}
m_SizeDelta: {x: 322.00043, y: 95.66644}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1779143265
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779143263}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9811321, g: 0.9302243, b: 0.9302243, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 80
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 80
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5F00\u59CB\u63A8\u6F14"
--- !u!222 &1779143266
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779143263}
m_CullTransparentMesh: 0
--- !u!1 &1807897133
GameObject:
m_ObjectHideFlags: 0
@ -54997,7 +55198,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 114688031
randSeed: 21092281
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -76997,6 +77198,11 @@ PrefabInstance:
propertyPath: model2_btn
value:
objectReference: {fileID: 199054390}
- target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: initiate_botn
value:
objectReference: {fileID: 78139659}
- target: {fileID: 5855821742305114459, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: m_Text

176
Assets/Zion/Scenes/SampleScene.unity
View File

@ -3014,6 +3014,52 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1002176553}
m_Modifications:
- target: {fileID: 75562425, guid: d69f70259c2b9364aaaebff19f477e6c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 75562425, guid: d69f70259c2b9364aaaebff19f477e6c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 75562425, guid: d69f70259c2b9364aaaebff19f477e6c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 75562425, guid: d69f70259c2b9364aaaebff19f477e6c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 726894358194116713, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 726894358194116713, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 850680702267493802, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1860977433267825292, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1860977433267825292, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1860977433267825292, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651080416002, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_Name
@ -3129,10 +3175,140 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4190038651164879948, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651202526660, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651655802449, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651655802449, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651655802449, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651655802449, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038651662970842, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652554789177, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652554789177, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652554789177, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652554789177, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652574681782, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 4190038652676085428, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652731363790, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652731363790, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652731363790, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652731363790, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4190038652838891245, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4918790080607414966, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7082100192815767800, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7082100192815767800, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7082100192815767800, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7082100192815767800, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7392146754304400180, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7433918573448231265, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7433918573448231265, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7433918573448231265, guid: d69f70259c2b9364aaaebff19f477e6c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d69f70259c2b9364aaaebff19f477e6c, type: 3}

2
Assets/Zion/Scripts/Adam/DragController.cs
View File

@ -38,6 +38,8 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
{
if (isDragWRJ)
{
model.GetComponent<UnmannedAerialVehicleManage>().isStartRehearsing = GlobalFlag.isStartRehearsing;
//for (int i = 0; i < huoPaoCtrls.Length; i++)
//{
// huoPaoCtrls[i].wrjs.Add(model);

42
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -19,9 +19,24 @@ public class GameManager : MonoBehaviour
public GameObject wrjDrag;
public GameObject ldDrag;
public GameObject hpDrag;
public GameObject Teacher;
public GameObject student;
// Start is called before the first frame update
private void Awake()
{
if (GlobalFlag.currentUser.role_code == "03")
{
Teacher.gameObject.SetActive(true);
student.gameObject.SetActive(false);
}
if (GlobalFlag.currentUser.role_code == "04")
{
Teacher.gameObject.SetActive(false);
student.gameObject.SetActive(true);
}
SyncCreateRoom.getroomusersRequset += OnGetRoomUsers;
SyncCreateRoom.send2roomRequset += OnOtherPlayerOnline;
SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
@ -29,6 +44,7 @@ public class GameManager : MonoBehaviour
spt.gameObject.transform.position = spawnPos.position;
spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles;
spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true);
ToolsBootstrap.Instance.SetCameraInfo(spt);
//0 red 1 blue
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{
@ -80,8 +96,30 @@ public class GameManager : MonoBehaviour
spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), false);
}
break;
case "StartDeduction":
GlobalFlag.isStartRehearsing = true;
for (int i = 0; i < UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Count; i++)
{
UnmannedAerialVehicleManage.unmannedAerialVehicleManages[i].isStartRehearsing = true;
}
break;
case "Stop":
GlobalFlag.isStartRehearsing = false;
for (int i = 0; i < UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Count; i++)
{
UnmannedAerialVehicleManage.unmannedAerialVehicleManages[i].isStartRehearsing = false;
}
break;
case "EndDeduction":
GlobalFlag.isStartRehearsing = false;
for (int i = 0; i < UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Count; i++)
{
UnmannedAerialVehicleManage.unmannedAerialVehicleManages[i].isStartRehearsing = false;
}
break;
case "offline":
break;
}
}
@ -104,7 +142,7 @@ public class GameManager : MonoBehaviour
userIds.Add(ulong.Parse(userInfo[0]));
}
}
string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{ GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}";
string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}";
_ = SyncCreateRoom.SendMessageAsync(msg);
}
@ -129,7 +167,7 @@ public class GameManager : MonoBehaviour
{
string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent;
Debug.Log(info);
if (info.Length > 0 &&!string .IsNullOrWhiteSpace(info))
if (info.Length > 0 && !string.IsNullOrWhiteSpace(info))
{
modelsInfo = Jsonanalyze.FromJson<List<ModelInfo>>(info);
for (int i = 0; i < modelsInfo.Count; i++)

12
Assets/Zion/Scripts/Adam/ToolsBootstrap.cs
View File

@ -1,11 +1,12 @@
using Assets.Zion.Scripts.Adam;
using AdamSync;
using Assets.Zion.Scripts.Adam;
using System.Collections;
using System.Collections.Generic;
using Umawerse.FiniteStateMachines;
using UnityEngine;
using UnityTemplateProjects;
public class ToolsBootstrap : MonoBehaviour
public class ToolsBootstrap : MonoSingleton<ToolsBootstrap>
{
private FiniteStateMachine _fsm;
public GameObject circlePointPrefab;
@ -39,6 +40,12 @@ public class ToolsBootstrap : MonoBehaviour
}
public void SetCameraInfo(SyncPlayerTransform syncPlayer)
{
mCamera = syncPlayer.GetComponent<Camera>();
simpleCameraController = syncPlayer.GetComponent<SimpleCameraController>();
}
/// <summary>
/// 1-3D 2-2D
/// </summary>
@ -56,6 +63,7 @@ public class ToolsBootstrap : MonoBehaviour
mCamera.orthographic = false;
simpleCameraController.enabled = true;
Switch2DModel(false);
UnmannedAerialVehicleUI.Instance.GetRouteSettings(false);
}
else if (state == 2)
{

4
Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs
View File

@ -8,4 +8,8 @@ public class GlobalFlag
public static string roomID;
public static string practiceId;
public static string practiceSeatId;
/// <summary>
///是否正在预演
/// </summary>
public static bool isStartRehearsing;
}

76
Assets/Zion/Scripts/Adam/WRJController.cs
View File

@ -7,8 +7,8 @@ public class WRJController : MonoBehaviour
public List<Vector3> wayPoints = new List<Vector3>();
public int index1 = 0;
public float speed;
public HuoPaoController[] huoPaoControllerList;
public List<HuoPaoController> attackTarget = new List<HuoPaoController>();
//public HuoPaoController[] huoPaoControllerList;
//public List<HuoPaoController> attackTarget = new List<HuoPaoController>();
public bool isMove = false;
public float dis;
public float limitDis;
@ -61,8 +61,8 @@ public class WRJController : MonoBehaviour
public void SetAttackTarget(HuoPaoController target)
{
if (!attackTarget.Contains(target))
attackTarget.Add(target);
//if (!attackTarget.Contains(target))
// attackTarget.Add(target);
}
@ -89,47 +89,47 @@ public class WRJController : MonoBehaviour
if (fireCount <= 0) return;
if (isAuto)
{
if (currentHuoPaoIndex >= huoPaoControllerList.Length - 1)
{
CancelInvoke("OnFire");
return;
}
//if (currentHuoPaoIndex >= huoPaoControllerList.Length - 1)
//{
// CancelInvoke("OnFire");
// return;
//}
if (huoPaoControllerList[currentHuoPaoIndex] == null)
{
currentHuoPaoIndex++;
}
//if (huoPaoControllerList[currentHuoPaoIndex] == null)
//{
// currentHuoPaoIndex++;
//}
if (firePos != null)
{
firePos.LookAt(huoPaoControllerList[currentHuoPaoIndex].transform.position);
GameObject fire = Instantiate(firePrefab);
fire.transform.eulerAngles = firePos.eulerAngles;
fire.transform.position = firePos.position;
fire.GetComponent<BulletController>().SetBoolIsMove();
}
//if (firePos != null)
//{
// firePos.LookAt(huoPaoControllerList[currentHuoPaoIndex].transform.position);
// GameObject fire = Instantiate(firePrefab);
// fire.transform.eulerAngles = firePos.eulerAngles;
// fire.transform.position = firePos.position;
// fire.GetComponent<BulletController>().SetBoolIsMove();
//}
}
else
{
if (currentHuoPaoIndex >= attackTarget.Count - 1)
{
CancelInvoke("OnFire");
return;
}
//if (currentHuoPaoIndex >= attackTarget.Count - 1)
//{
// CancelInvoke("OnFire");
// return;
//}
if (attackTarget[currentHuoPaoIndex] == null)
{
currentHuoPaoIndex++;
}
//if (attackTarget[currentHuoPaoIndex] == null)
//{
// currentHuoPaoIndex++;
//}
if (firePos != null)
{
firePos.LookAt(attackTarget[currentHuoPaoIndex].transform.position);
GameObject fire = Instantiate(firePrefab);
fire.transform.eulerAngles = firePos.eulerAngles;
fire.transform.position = firePos.position;
fire.GetComponent<BulletController>().SetBoolIsMove();
}
//if (firePos != null)
//{
// firePos.LookAt(attackTarget[currentHuoPaoIndex].transform.position);
// GameObject fire = Instantiate(firePrefab);
// fire.transform.eulerAngles = firePos.eulerAngles;
// fire.transform.position = firePos.position;
// fire.GetComponent<BulletController>().SetBoolIsMove();
//}
}
fireCount--;
}

19
Assets/Zion/Scripts/Adam/WRJManager.cs
View File

@ -25,15 +25,18 @@ namespace Assets.Zion.Scripts.Adam
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hitInfo;
if (Physics.Raycast(ray, out hitInfo, 1000, 1 << 9))
if (Physics.Raycast(ray, out hitInfo, 1000))
{
Debug.Log("daadad");
currentWRJ = hitInfo.collider.GetComponent<WRJController>();
if (!wRJControllers.Contains(currentWRJ))
wRJControllers.Add(currentWRJ);
wrjMenuSetPanel.gameObject.SetActive(true);
Vector3 posItem = GetScreenPosition(hitInfo.collider.gameObject);
wrjMenuSetPanel.anchoredPosition = new Vector3(posItem.x + 100f, posItem.y, posItem.z);
if (hitInfo.collider.tag == "WRJ")
{
Debug.Log("daadad");
currentWRJ = hitInfo.collider.GetComponent<WRJController>();
if (!wRJControllers.Contains(currentWRJ))
wRJControllers.Add(currentWRJ);
wrjMenuSetPanel.gameObject.SetActive(true);
Vector3 posItem = GetScreenPosition(hitInfo.collider.gameObject);
wrjMenuSetPanel.anchoredPosition = new Vector3(posItem.x + 100f, posItem.y, posItem.z);
}
}
else
{

25
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -9,14 +9,16 @@ using UnityEngine;
public class UnmannedAerialVehicleManage : MonoBehaviour
{
/// <summary>
/// 状态
/// </summary>
public Pattern pattern = Pattern.待机;
public static List<UnmannedAerialVehicleManage> unmannedAerialVehicleManages = new List<UnmannedAerialVehicleManage>();
/// <summary>
/// 是否正在预演
/// </summary>
public bool isStartRehearsing = false;
/// <summary>
/// 状态
/// </summary>
public Pattern pattern = Pattern.待机;
/// <summary>
/// 测试用
@ -88,10 +90,11 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
// Start is called before the first frame update
void Start()
{
unmannedAerialVehicleManages.Add(this);
//Weaponitem weaponitem;
//weaponitem = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitem>(msg);
//weaponitems.Add(weaponitem);
weaponitemones= Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(msg);
weaponitemones = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(msg);
FillInTheData(weaponitemones);//测试写入
Formation(1);//默认阵型
}
@ -99,9 +102,17 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
// Update is called once per frame
void Update()
{
if (Input.GetKeyDown(KeyCode.V))
if (Input.GetMouseButtonDown(1))
{
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hitInfo;
if (Physics.Raycast(ray, out hitInfo, 1000))
{
if (hitInfo.collider.tag == "WRJ")
{
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = transform.GetComponent<UnmannedAerialVehicleManage>();
}
}
}
}