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

Compare commits

base: wulongxiao:c28cca2d95021bc58baa57f3f1119ef89c43dcd0
Branches Tags
wulongxiao:main
..
compare: wulongxiao:20525a4d969e7af99b26e63da49d174fa86ebb51
Branches Tags
wulongxiao:main

No commits in common. "c28cca2d95021bc58baa57f3f1119ef89c43dcd0" and "20525a4d969e7af99b26e63da49d174fa86ebb51" have entirely different histories.
c28cca2d95 ... 20525a4d96

5 changed files with 117 additions and 89 deletions
Show Stats Expand all files Collapse all files

136
xiaofang/Assets/Scenes/Schedule_03333333333.unity → xiaofang/Assets/Scenes/Schedule_03333.unity
View File

@ -3557,6 +3557,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7e8b72074fc60764b8554d7067527809, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &825373660 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 51007377463830339, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
m_PrefabInstance: {fileID: 1799705458}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &856136726
PrefabInstance:
m_ObjectHideFlags: 0
@ -5650,10 +5655,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 618256459}
m_Modifications:
- target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: title
value:
objectReference: {fileID: 865567722}
- target: {fileID: 7468736063766935910, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
propertyPath: MainPanel
value:
@ -6113,17 +6114,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
m_PrefabInstance: {fileID: 865567720}
m_PrefabAsset: {fileID: 0}
--- !u!114 &865567722 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7468736064578063281, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
m_PrefabInstance: {fileID: 865567720}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &911824229
GameObject:
m_ObjectHideFlags: 0
@ -8726,7 +8716,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1417128757
MonoBehaviour:
m_ObjectHideFlags: 0
@ -10524,6 +10514,46 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 618256459}
m_Modifications:
- target: {fileID: 51007377463830339, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 51007377463830339, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 51007377463830342, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_VerticalFit
value: 2
objectReference: {fileID: 0}
- target: {fileID: 51007377463830342, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_HorizontalFit
value: 2
objectReference: {fileID: 0}
- target: {fileID: 370120539392972246, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000014001576
objectReference: {fileID: 0}
- target: {fileID: 380336514535910973, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 380336514535910973, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1662720451953426838, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_Content
value:
objectReference: {fileID: 825373660}
- target: {fileID: 1662720451953426838, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_Horizontal
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1662720451953426838, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_MovementType
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2102021659995593758, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -10606,7 +10636,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2102021660636739381, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.x
value: -361.72
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2102021660636739381, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.y
@ -10660,6 +10690,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2102021661112157380, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_Horizontal
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2102021661231301985, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -10684,6 +10718,22 @@ PrefabInstance:
propertyPath: jsonReader
value:
objectReference: {fileID: 1417128757}
- target: {fileID: 2658781182633319536, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2658781182633319536, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4051613669538919690, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4051613669538919690, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: -8.5
objectReference: {fileID: 0}
- target: {fileID: 4764228630647718977, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -10702,19 +10752,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4764228630658219266, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228630658219266, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228630658219266, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 190.05
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228630658219266, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23.991
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228630805767484, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_Name
@ -10722,7 +10772,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4764228630805767484, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4764228630805767485, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_Pivot.x
@ -10810,7 +10860,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4764228631245731675, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.x
value: 249.00002
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228631278755134, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228631278755135, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.x
@ -10834,19 +10888,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4764228632225803364, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228632225803364, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228632225803364, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 58.95
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228632225803364, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23.991
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4764228632238488446, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
@ -10864,6 +10918,34 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -39.08695
objectReference: {fileID: 0}
- target: {fileID: 5097990001440067949, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5837674814315639197, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837674814315639197, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5837674814315639197, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7538115214979638682, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7538115214979638682, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7538115214979638682, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196293257107006892, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_IsActive
value: 0

2
xiaofang/Assets/Scenes/Schedule_03333333333.unity.meta → xiaofang/Assets/Scenes/Schedule_03333.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a73dbc35051d4614a8e27d92a0830665
guid: d2b637663b3f5db4fa358637e1e18f67
DefaultImporter:
externalObjects: {}
userData:

14
xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
View File

@ -14,7 +14,6 @@ public class EvacuationPanel : MonoBehaviour
public Text topText;
public List<ClassItem> classItemList = new List<ClassItem>();
public List<ClassMate> classMateList = new List<ClassMate>();
[Header("学生数量")]
public InputField StuCountInputField;
@ -51,22 +50,11 @@ public class EvacuationPanel : MonoBehaviour
private void ClearData()
{
jc.classItem.isSet = false;
foreach (var item in classItemList)
foreach(var item in classItemList)
{
item.isSet = false;
item.setClassItem("");
}
jc.classMate.isBeSet = false;
foreach(var item in jc.classMateList)
{
item.isBeSet = false;
item.setName();
}
}
// Update is called once per frame

23
xiaofang/Assets/yhj/scripts/ClassMate.cs
View File

@ -8,33 +8,19 @@ public class ClassMate : MonoBehaviour
{
public JueseChoicePop jueseChoicePop;
public Text classmatename;
public string s;
public Button otherButton;
public Button button;
public bool isClear = false;
public bool isBeSet = false;
// Start is called before the first frame update
void Start()
{
button.onClick.AddListener(Click);
s = classmatename.text;
}
public void Click()
{
if(isBeSet == false)
{
jueseChoicePop.SetClassMate(this);
}
else
{
jueseChoicePop.ChangeClassMate();
}
//classmatename.text +=
}
public void SetJc(JueseChoicePop jc)
@ -42,11 +28,6 @@ public class ClassMate : MonoBehaviour
jueseChoicePop = jc;
}
public void setName()
{
classmatename.text = s;
}
// Update is called once per frame
void Update()
{

29
xiaofang/Assets/yhj/scripts/JueseChoicePop.cs
View File

@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
@ -13,10 +12,6 @@ public class JueseChoicePop : MonoBehaviour
public Button Surebtn;
public GameObject classmatePrefab;
public Transform content;
public List<ClassMate> classMateList = new List<ClassMate> ();
//public string s;
// Start is called before the first frame update
void Start()
{
@ -49,12 +44,10 @@ public class JueseChoicePop : MonoBehaviour
{
for (int i = 0; i < 10; i++)
{
GameObject item = GameObject.Instantiate<GameObject>(classmatePrefab, content);
ClassMate classMate = item.GetComponent<ClassMate>();
classMateList.Add(classMate);
classMate.SetJc(this);
}
}
@ -64,27 +57,11 @@ public class JueseChoicePop : MonoBehaviour
}
public void SetClassMate(ClassMate classMate,string a = "")
public void SetClassMate(ClassMate classMate)
{
classMate.isBeSet = true;
classItem.isSet = true;
this.classMate = classMate;
classItem.setClassItem(classMate.classmatename.text);
//s = classMate.classmatename.text;
this.classMate.classmatename.text = classMate.classmatename.text + "(" + classItem.classname.text + ")";
classMate.classmatename.text = classMate.classmatename.text + "(" + classItem.classname.text + ")";
}
public void ClearClassMate()
{
}
public void ChangeClassMate()
{
}
}