This commit is contained in:
YangHua 2024-06-13 09:39:22 +08:00
parent b74f35329d
commit 9be96f9371
25 changed files with 747 additions and 1572 deletions

View File

@ -35,6 +35,8 @@ namespace Adam
UIManager.Instance.toolsItemManager.recoverBtn.onClick?.Invoke();
}
UIManager.Instance.bottomCotroller.BirdEyeView.isOn = false;
UIManager.Instance.bottomCotroller.updownLadder.isOn = false;
UIManager.Instance.bottomCotroller.updownLadder.gameObject.SetActive(false);
SceneLoad.Instance.isOnece = true;
SceneLoad.Instance.MaskLoadInfoPanel();
//ExamusersController.Instance.Init();

View File

@ -59,11 +59,12 @@ public class LoginController : MonoBehaviour
string[] tempInfo = info.Split("//;");
string[] currentModelInfo = tempInfo[1].Split(";");
GlobalFlag.systemUserId = currentModelInfo[2];
GlobalFlag.userName = currentModelInfo[3];
//foreach (var item in currentModelInfo)
//{
// Debug.Log(item);
//}
GlobalFlag.userName = currentModelInfo[2];
UIManager.Instance.time.SetTime(int.Parse(currentModelInfo[4]));
foreach (var item in currentModelInfo)
{
Debug.Log(item);
}
}
public void OnLogin()

View File

@ -121,7 +121,13 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
public void RecoverCurrentInstantiateTool(GameObject tool)
{
if (tool != null)
{
if (tool.name == "工作证(Clone)")
{
GameManager.Instance.npcwayPoints.StartMove();
}
Destroy(tool);
}
bottomToolToggle.interactable = true;
recoverBtn.gameObject.SetActive(false);
}

View File

@ -42,6 +42,7 @@ public class UIManager : MonoSingleton<UIManager>
string json = FileUtil.ReadFromLocal("Message.json");
messageData = JsonConvert.DeserializeObject<MessageData>(json);
ExamusersController.Instance.Init();
}
// Use this for initialization
private void Start()

View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 1530819393981207668}
m_Layer: 0
m_Name: NPC
m_TagString: Untagged
m_TagString: NPC
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -71,7 +71,6 @@ MonoBehaviour:
isMove: 0
isOnce: 0
isLooked: 1
customTip: {fileID: 0}
--- !u!1 &1873490784713911015
GameObject:
m_ObjectHideFlags: 0

View File

@ -14,12 +14,12 @@ GameObject:
- component: {fileID: 8978250623430911335}
- component: {fileID: 8978250623430911352}
m_Layer: 5
m_Name: Button
m_Name: "\u6536\u56DE"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8978250623430911332
RectTransform:
m_ObjectHideFlags: 0

View File

@ -14,30 +14,33 @@ public class Multimeter : MonoBehaviour
public bool isBlack;
public string VV;
public bool isok = false;
public GameObject huishouBtn;
public void Init()
{
activation = ClampAmmetersManager.Instance.Init(name);
huishouBtn = GameManager.Instance.MultimeterIm.gameObject;
huishouBtn.SetActive(false);
}
private void OnMouseDown()
{
if (GameManager.Instance.BlackWanYon != null && isBlack)
{
huishouBtn.SetActive(true);
GameManager.Instance.BlackWanYon.transform.parent = transform;
GameManager.Instance.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
GameManager.Instance.BlackWanYon.transform.DOScale(new Vector3(200, 200, 200), 0.25f);
GameManager.Instance.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
GameManager.Instance.BlackWanYon.layer = 0;
GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(false);
GameManager.Instance.redok = true;
GameManager.Instance.DianFuIm.gameObject.SetActive(true);
if (GameManager.Instance.redok)
{
if (GameManager.Instance.WanStopValve.currentValue >= 2)
{
GameManager.Instance.DianFuIm.gameObject.SetActive(true);
GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
huishouBtn.SetActive(true);
GameManager.Instance.show(GameManager.Instance.redData + VV);
}
else
@ -48,20 +51,21 @@ public class Multimeter : MonoBehaviour
}
if (GameManager.Instance.RedWanYon != null && !isBlack)
{
huishouBtn.SetActive(true);
GameManager.Instance.RedWanYon.transform.parent = transform;
GameManager.Instance.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
GameManager.Instance.RedWanYon.transform.DOScale(new Vector3(200, 200, 200), 0.25f);
GameManager.Instance.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f, 0.08f, 0.11f), 0.25f);
GameManager.Instance.RedWanYon.layer = 0;
UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(false);
GameManager.Instance.DianFuIm.gameObject.SetActive(true);
if (GameManager.Instance.redok)
{
if (GameManager.Instance.WanStopValve.currentValue >= 2)
{
GameManager.Instance.DianFuIm.gameObject.SetActive(true);
GameManager.Instance.DianFuTex.text = activation;
GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
huishouBtn.SetActive(true);
GameManager.Instance.show(activation + VV);
}
else

View File

@ -18,14 +18,13 @@ public class MultimeterRecovery : MonoBehaviour
// Start is called before the first frame update
void Start()
{
btn = GetComponent<Button>();
btn.onClick.AddListener(() =>
{
//GameManager.Instance.DianFuIm.gameObject.SetActive(true);
//GameManager.Instance.DianFuTex.text = Multimeter + MultimeterV;
trans = GameManager.Instance.temp.transform;
if (GameManager.Instance.RedWanYon)
if (GameManager.Instance.RedWanYon!=null&& GameManager.Instance.RedWanYon)
{
RedTrans = GameManager.Instance.RedWanYon.transform;
RedTrans.parent = trans;
@ -35,7 +34,7 @@ public class MultimeterRecovery : MonoBehaviour
RedTrans.transform.DOLocalMove(Redpos, 0.25f);
RedTrans.gameObject.layer = 7;
}
if (GameManager.Instance.BlackWanYon)
if (GameManager.Instance.BlackWanYon != null && GameManager.Instance.BlackWanYon)
{
BlackTrans = GameManager.Instance.BlackWanYon.transform;
BlackTrans.parent = trans;
@ -49,6 +48,6 @@ public class MultimeterRecovery : MonoBehaviour
GameManager.Instance.show("0");
UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
});
btn.gameObject.SetActive(false);
//btn.gameObject.SetActive(false);
}
}

View File

@ -54,6 +54,7 @@ public class GameManager : MonoBehaviour
public LadderCtr ladderCtr;
private Vector3 lastPlayerPos = new Vector3();
private Vector3 lastPlayereugle = new Vector3();
public NPCWaypoints npcwayPoints;
public void Awake()
{
if (Instance != null)
@ -68,6 +69,7 @@ public class GameManager : MonoBehaviour
{
//init();
}
npcwayPoints = GameObject.FindGameObjectWithTag("NPC").GetComponent<NPCWaypoints>();
}
// Start is called before the first frame update
private void Start()

View File

@ -34,7 +34,7 @@ public class BoxPengZhuang : MonoBehaviour
{
g1.gameObject.SetActive(true);
g1.init(dialogue);
gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
//gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
gameObject.SetActive(false);
//if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
//{

View File

@ -2168,6 +2168,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 145989168365683697, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989168690554921, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
@ -2184,6 +2188,18 @@ PrefabInstance:
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 145989169426372346, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989169541319115, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989170052383509, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989170102714932, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
@ -2252,10 +2268,34 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897479074467956357, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 7058093995138870524, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 7152164904769191792, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 7567031269211186467, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 7687811932894201751, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 8756267885969503407, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 9223058999395023169, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"

View File

@ -3636,6 +3636,38 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 145989168365683697, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989168690554921, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 145989169241954026, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 145989169252765999, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 145989169426372346, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989169541319115, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989170052383509, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 145989170102714932, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 3298272072167696729, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: m_Name
value: "\u914D\u7535\u623F"
@ -3684,6 +3716,38 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6897479074467956357, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 7058093995138870524, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 7152164904769191792, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 7567031269211186467, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 7687811932894201751, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 8756267885969503407, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 9223058999395023169, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
--- !u!20 &1020671387576034506 stripped
@ -3732,7 +3796,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.y
value: -0.19
value: -0.25
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.z

View File

@ -4312,11 +4312,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.y
value: -4.139
value: -4.069
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.z
value: -10.09
value: -12.197
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalRotation.w

View File

@ -17137,7 +17137,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
propertyPath: m_LocalPosition.x
value: 58.37
value: 58.532
objectReference: {fileID: 0}
- target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
propertyPath: m_LocalPosition.y
@ -17145,7 +17145,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
propertyPath: m_LocalPosition.z
value: 338.41
value: 337.252
objectReference: {fileID: 0}
- target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
propertyPath: m_LocalRotation.w
@ -59578,21 +59578,25 @@ PrefabInstance:
propertyPath: waypoints.Array.data[3]
value:
objectReference: {fileID: 992012207}
- target: {fileID: 1873490784713911017, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: g1
value:
objectReference: {fileID: 850703931}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.x
value: 58.568
value: 58.569
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.y
value: 0.181
value: 0.093
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalPosition.z
value: 341.929
value: 342.238
objectReference: {fileID: 0}
- target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
propertyPath: m_LocalRotation.w
@ -68852,7 +68856,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992012206}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -83656,6 +83660,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: -2.093
objectReference: {fileID: 0}
- target: {fileID: 7960679610476500941, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7960679611115337252, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
propertyPath: m_LocalPosition.x
value: -3.116
@ -83664,6 +83672,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: -1.149
objectReference: {fileID: 0}
- target: {fileID: 7960679611115337253, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7960679611374105292, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
propertyPath: m_Name
value: WayPoints
@ -83720,6 +83732,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0.895
objectReference: {fileID: 0}
- target: {fileID: 7960679611492082761, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
--- !u!4 &1173306830 stripped
@ -103048,6 +103064,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8978250623430911333, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
propertyPath: m_Name
value: "\u6536\u56DE"
objectReference: {fileID: 0}
- target: {fileID: 8978250623430911333, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8978250624421430162, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
propertyPath: m_Name
value: OnCanvas
@ -103136,6 +103160,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8978250625156820819, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
--- !u!1 &1454996775 stripped
@ -152440,6 +152468,22 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5114093392494344435, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
propertyPath: m_Name
value: ladderPos
@ -155145,6 +155189,18 @@ PrefabInstance:
propertyPath: m_Name
value: "\u7535\u7EBF\u6746-\u9AD8\u538B"
objectReference: {fileID: 0}
- target: {fileID: 720621513189304380, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 805963651716084125, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 1414724816123219656, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 1449621618336171357, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
@ -155153,18 +155209,78 @@ PrefabInstance:
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 1845557385194524801, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 1861846161457238796, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 2190010506225839555, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 2198314697449573446, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 2395303408719195498, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 2581534194450743039, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA3"
objectReference: {fileID: 0}
- target: {fileID: 3279334675836538692, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 3430818456542731002, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 3526413907430538486, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 4570084968712821754, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 4673424770303825621, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: g1
value:
objectReference: {fileID: 716420606400251999}
- target: {fileID: 4673424770303825621, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA3"
objectReference: {fileID: 0}
- target: {fileID: 4797098137339101998, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 5139717895155241705, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 5299068766435687800, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 5443605320128449044, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 5837186607582808079, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 5846001382694744571, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 5893981508350512868, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: m_IsActive
value: 1
@ -155213,6 +155329,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5948804343269878323, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
- target: {fileID: 7054410357581551140, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA3"
objectReference: {fileID: 0}
- target: {fileID: 7345326101414089909, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_BA2"
objectReference: {fileID: 0}
- target: {fileID: 7791014022139435227, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_AA2"
objectReference: {fileID: 0}
- target: {fileID: 8613767990833624184, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
propertyPath: selChildName
value: "\u7528\u7535_CA2"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
--- !u!1 &716420606400251998 stripped
@ -155220,6 +155356,11 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 5893981508350512868, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
m_PrefabInstance: {fileID: 716420606400251997}
m_PrefabAsset: {fileID: 0}
--- !u!1 &716420606400251999 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2702006292506422886, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
m_PrefabInstance: {fileID: 716420606400251997}
m_PrefabAsset: {fileID: 0}
--- !u!4 &716729920141992819
Transform:
m_ObjectHideFlags: 0

View File

@ -18650,7 +18650,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 2
m_TargetDisplay: 0
--- !u!114 &851677357
MonoBehaviour:

View File

@ -16,12 +16,16 @@ public class Timers : MonoBehaviour
public UnityEvent timeOver;
// Start 方法在脚本激活时运行,用于初始化计时器
void Start()
public void SetTime(int _time)
{
StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/Timer.config"));
//StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/Timer.config"));
limitTime = _time * 60;
guiTimer.text = StringHelper.GetCountDownStr((int)countTime);
}
// 运行计时器
public void RunTimer()
{
@ -57,7 +61,7 @@ public class Timers : MonoBehaviour
if (countTime < limitTime)
{
countTime += Time.deltaTime;
guiTimer.text = "考试时间:"+StringHelper.GetCountDownStr((int)countTime);
guiTimer.text = "考试时间:" + StringHelper.GetCountDownStr((int)countTime);
}
else
{

View File

@ -1,5 +1,5 @@
{
"scenename": "室外型高供计",
"scenename": "室外型高供计",
"questbooks": "任务书",
"userinformation": "用户基本信息",
"userList": [

View File

@ -1 +1 @@
Build from DESKTOP-G8EB9JK at 2024/6/11 17:17:31
Build from ADAM at 2024/6/12 19:52:01

View File

@ -1 +1 @@
2024-05-15 17:17:01#'sxfz://;1(0:练习1:考试);6试卷id/练习id;581用户信息userId;1实训分类id;90(考试时长);/'|
2024-05-15 17:17:01#'sxfz://;1;6;581;1;90;/'|

View File

@ -15,7 +15,7 @@ EditorBuildSettings:
path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity"
guid: 9c3f2fccc37312b468a01a18ac50fcd9
- enabled: 1
path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1\u7528\u6237.unity"
path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1.unity"
guid: b9e12f554e1070f419af46ba6716ac76
- enabled: 1
path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u9AD8\u8BA1.unity"
@ -24,9 +24,9 @@ EditorBuildSettings:
path: "Assets/Scenes/\u5BA4\u5916\u578B\u4F4E\u538B\u516C\u914D\u53D8\u7528\u6237/\u5BA4\u5916\u578B\u4F4E\u538B\u516C\u914D\u53D8.unity"
guid: 87fc4562e9d0bff4b8dcb5b8005bd4b1
- enabled: 1
path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1\u7528\u6237.unity"
path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1.unity"
guid: f9f28607361ada64e92ffcb6097957b3
- enabled: 1
path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1\u7528\u6237.unity"
path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1.unity"
guid: 68718b0a532bef14ab2a5a212be4c8a3
m_configObjects: {}

View File

@ -16,6 +16,7 @@ TagManager:
- FuAnBiao
- AllTools
- UICamera
- NPC
layers:
- Default
- TransparentFX