wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

场景小修改

Browse Source
This commit is contained in:
liuliang 2024-12-26 23:07:55 +08:00
parent c7ae9cac51
commit 8c6a171f9d
3 changed files with 96 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xiaofang/Assets/Res/gsj/scripts/Starthost.cs
View File

@ -10,14 +10,16 @@ public class Starthost : MonoBehaviour
// 定义委托事件
public delegate void BoolValueChanged(bool newValue);
public static event BoolValueChanged OnBoolValueChanged;
//定义委托事件是否开始
public delegate void BoolIsStart(bool newValue);
public static event BoolIsStart OnBoolStart;
private bool isRotating = false; // 默认旋转状态
private GameObject panel;
private Button posiBtn;//人员到位情况按钮
private Button start;//开始演练按钮
public bool isReady;//在线玩家是否准备
public bool isSatisfy;//人员是否满足
public bool isStart;//演习是否开始
public bool isStart=false;//演习是否开始
private GameObject time;//计时
private Text timeText;//计时时间
private bool isTimerRunning=false;//是否开始计时
@ -170,8 +172,7 @@ public class Starthost : MonoBehaviour
}
//开始进行演习
void OnClickStartBtn()
{
isStart = true;
{
if (isSatisfy)
{
peopleposition.SetActive(false);
@ -190,7 +191,9 @@ public class Starthost : MonoBehaviour
//SceneManager.LoadScene(4);
//开始计时
isTimerRunning = true;
time.SetActive(true);
time.SetActive(true);
isStart = true;
OnBoolStart?.Invoke(isStart);
}
else
{

36
xiaofang/Assets/Resources/gsjUI/Panel1_2.prefab
View File

@ -318,9 +318,9 @@ RectTransform:
m_Father: {fileID: 286532050680097195}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -54.0782}
m_SizeDelta: {x: 303.2452, y: 108.1564}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &286532049526016700
@ -795,7 +795,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 121a0c9d8f5a7e946ad99dae6c1203b3, type: 3}
m_Sprite: {fileID: 21300000, guid: 9fb12da871b1c9844a1ea5ffbd224dc0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1530,7 +1530,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 121a0c9d8f5a7e946ad99dae6c1203b3, type: 3}
m_Sprite: {fileID: 21300000, guid: 1ddcf0d6b99d56e40a2f12a5169cbf81, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1904,9 +1904,9 @@ RectTransform:
m_Father: {fileID: 286532050680097195}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -378.54742}
m_SizeDelta: {x: 303.2452, y: 108.1564}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &286532049992671429
@ -2494,7 +2494,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 121a0c9d8f5a7e946ad99dae6c1203b3, type: 3}
m_Sprite: {fileID: 21300000, guid: 20d47785dfd86e046ab5ecc39cdf37c6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4332,9 +4332,9 @@ RectTransform:
m_Father: {fileID: 286532050680097195}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -486.7038}
m_SizeDelta: {x: 303.2452, y: 108.1564}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &286532050854345676
@ -5320,9 +5320,9 @@ RectTransform:
m_Father: {fileID: 286532050680097195}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -270.391}
m_SizeDelta: {x: 303.2452, y: 108.1564}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &286532051015508370
@ -6226,9 +6226,9 @@ RectTransform:
m_Father: {fileID: 286532050680097195}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165, y: -162.2346}
m_SizeDelta: {x: 303.2452, y: 108.1564}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &286532051291737756

124
xiaofang/Assets/Scenes/Tmap 1.unity
View File

@ -18890,7 +18890,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1039624182
MonoBehaviour:
m_ObjectHideFlags: 0
@ -30109,52 +30109,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1669431569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1669431571}
- component: {fileID: 1669431570}
m_Layer: 0
m_Name: BurstCollisionWorld
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1669431570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1669431569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
m_Name:
m_EditorClassIdentifier:
cellSpans:
m_AlignBytes: 16
--- !u!4 &1669431571
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1669431569}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 43
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1669431738
MeshCollider:
m_ObjectHideFlags: 0
@ -32222,6 +32176,52 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 6160620039382372331, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3}
--- !u!1 &1787594730
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1787594732}
- component: {fileID: 1787594731}
m_Layer: 0
m_Name: BurstCollisionWorld
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1787594731
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1787594730}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
m_Name:
m_EditorClassIdentifier:
cellSpans:
m_AlignBytes: 16
--- !u!4 &1787594732
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1787594730}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 43
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1788785149
PrefabInstance:
m_ObjectHideFlags: 0
@ -38538,7 +38538,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &837023030938325404
MonoBehaviour:
m_ObjectHideFlags: 0
@ -38621,7 +38621,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &837023031067115947
MonoBehaviour:
m_ObjectHideFlags: 0
@ -38704,7 +38704,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &837023031193365524
MonoBehaviour:
m_ObjectHideFlags: 0
@ -38787,7 +38787,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!222 &837023031304053796
CanvasRenderer:
m_ObjectHideFlags: 0
@ -39103,7 +39103,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!222 &837023031586033361
CanvasRenderer:
m_ObjectHideFlags: 0
@ -39617,7 +39617,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!222 &837023032196213114
CanvasRenderer:
m_ObjectHideFlags: 0
@ -47610,6 +47610,7 @@ GameObject:
- component: {fileID: 4163391439018457502}
- component: {fileID: 4163391439018457568}
- component: {fileID: 4163391439018457571}
- component: {fileID: 4163391439018457572}
m_Layer: 0
m_Name: TopCamera
m_TagString: Untagged
@ -47723,6 +47724,21 @@ MonoBehaviour:
rotationRadius: 50
rotationHeight: 5
rotationSpeed: 36
--- !u!114 &4163391439018457572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4163391439018457500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 596a3807554d7de459064cbc2d74e1fe, type: 3}
m_Name:
m_EditorClassIdentifier:
mainCamera: {fileID: 4163391439018457569}
uiCanvas: {fileID: 5640692783290307689}
targetIconPrefab: {fileID: 8713418931512314564, guid: 00c7bf087b3a01e4bb5cc113b5d6d5fc, type: 3}
--- !u!4 &4174389542944889711
Transform:
m_ObjectHideFlags: 0
@ -66822,7 +66838,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000091552734}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -259.1844}
m_Pivot: {x: 0, y: 1}
--- !u!1 &5723411037200588897
GameObject: