9月14下午
This commit is contained in:
parent
a0a80f1498
commit
e859badd0f
|
|
@ -2696,6 +2696,9 @@ PrefabInstance:
|
||||||
- targetCorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
- targetCorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||||
insertIndex: -1
|
insertIndex: -1
|
||||||
addedObject: {fileID: 1040707731}
|
addedObject: {fileID: 1040707731}
|
||||||
|
- targetCorrespondingSourceObject: {fileID: 2254929100106748975, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||||
|
insertIndex: -1
|
||||||
|
addedObject: {fileID: 1847624254}
|
||||||
- targetCorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
- targetCorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||||
insertIndex: -1
|
insertIndex: -1
|
||||||
addedObject: {fileID: 1175298433}
|
addedObject: {fileID: 1175298433}
|
||||||
|
|
@ -2729,6 +2732,11 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: fcf30122e3df4e21b28e6350ce252d16, type: 3}
|
m_Script: {fileID: 11500000, guid: fcf30122e3df4e21b28e6350ce252d16, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!1 &191666370 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2254929100106748975, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 191666367}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &207499132
|
--- !u!1 &207499132
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4403,7 +4411,6 @@ GameObject:
|
||||||
- component: {fileID: 357746246}
|
- component: {fileID: 357746246}
|
||||||
- component: {fileID: 357746248}
|
- component: {fileID: 357746248}
|
||||||
- component: {fileID: 357746247}
|
- component: {fileID: 357746247}
|
||||||
- component: {fileID: 357746249}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: "\u5206\u6570 (1)"
|
m_Name: "\u5206\u6570 (1)"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -4472,21 +4479,6 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 357746245}
|
m_GameObject: {fileID: 357746245}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!114 &357746249
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 357746245}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
overGame: {fileID: 357746245}
|
|
||||||
text: {fileID: 294718495}
|
|
||||||
scoreText: {fileID: 1561787732}
|
|
||||||
--- !u!1 &367232219
|
--- !u!1 &367232219
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -16192,12 +16184,12 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1406223268}
|
m_GameObject: {fileID: 1406223268}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 29a20ca670e09c849b79bec899abeb97, type: 3}
|
m_Script: {fileID: 11500000, guid: 29a20ca670e09c849b79bec899abeb97, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
CompleteOverComponent: {fileID: 357746249}
|
CompleteOverComponent: {fileID: 1847624254}
|
||||||
SubmitPlane: {fileID: 752036139}
|
SubmitPlane: {fileID: 752036139}
|
||||||
--- !u!1 &1420796210
|
--- !u!1 &1420796210
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -19833,7 +19825,19 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1662704226}
|
m_TargetGraphic: {fileID: 1662704226}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 357746245}
|
||||||
|
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
--- !u!114 &1662704226
|
--- !u!114 &1662704226
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -22339,6 +22343,21 @@ RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 178020885541006542, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
m_CorrespondingSourceObject: {fileID: 178020885541006542, guid: fa12b84946083d14cb4447029910be28, type: 3}
|
||||||
m_PrefabInstance: {fileID: 191666367}
|
m_PrefabInstance: {fileID: 191666367}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &1847624254
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 191666370}
|
||||||
|
m_Enabled: 0
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
overGame: {fileID: 357746245}
|
||||||
|
text: {fileID: 294718495}
|
||||||
|
scoreText: {fileID: 1561787732}
|
||||||
--- !u!1 &1882983958
|
--- !u!1 &1882983958
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ public class APIs
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 虚拟仿真考试提交分数
|
/// 虚拟仿真考试提交分数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/pro/score/simulationScore";
|
public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/member/pro/score/simulationScore";
|
||||||
|
|
||||||
|
|
||||||
public static string queryByExamId = PlayerPrefs.GetString("IP") + "/proSimulationExamination/queryById?id=";
|
public static string queryByExamId = PlayerPrefs.GetString("IP") + "/proSimulationExamination/queryById?id=";
|
||||||
|
|
|
||||||
|
|
@ -589,7 +589,7 @@ namespace DefaultNamespace.ProcessMode
|
||||||
|
|
||||||
public void OnUpdate()
|
public void OnUpdate()
|
||||||
{
|
{
|
||||||
Debug.Log("==>当前得分:" + CalculateTotalScore());
|
//Debug.Log("==>当前得分:" + CalculateTotalScore());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnDestroy()
|
public void OnDestroy()
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ namespace ToolsPack
|
||||||
public class ToolsPackSceneJump : MonoBehaviour
|
public class ToolsPackSceneJump : MonoBehaviour
|
||||||
{
|
{
|
||||||
public string Scenename;
|
public string Scenename;
|
||||||
private string saveSN;//LY
|
static private string saveSN;//LY
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
//学习模式下不能返回工具间
|
//学习模式下不能返回工具间
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
2024-07-19 16:52:07#'ydcj://;cb,0,47,userId,username,token,90,-1,-1,http://ef0ba11.r27.cpolar.top;'|
|
2024-07-19 16:52:07#'ydcj://;cb,1,47,userId,username,token,90,-1,-1,http://172.16.1.128:9206;'|
|
||||||
|
|
@ -84,6 +84,7 @@ public class ToolManager : MonoBehaviour
|
||||||
});
|
});
|
||||||
processBt.onClick.AddListener(delegate
|
processBt.onClick.AddListener(delegate
|
||||||
{
|
{
|
||||||
|
Debug.Log("ToolManager=>processBt");
|
||||||
ui.SetActive(false);
|
ui.SetActive(false);
|
||||||
});
|
});
|
||||||
MotionEngine.GetModule<ToolsPackManager>().OnStringEvent += HandleStringEvents;
|
MotionEngine.GetModule<ToolsPackManager>().OnStringEvent += HandleStringEvents;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue