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

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

Browse Source
This commit is contained in:
liuliang 2024-12-27 20:33:58 +08:00
commit e88882a908
8 changed files with 117 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xiaofang/Assets/Prefabs/itemPrefabs/btnPlayerChoose.prefab
View File

@ -55,6 +55,7 @@ MonoBehaviour:
defaultColor: {r: 1, g: 1, b: 1, a: 1}
addedColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
selectedColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
peopleId:
--- !u!1 &4204671801752310762
GameObject:
m_ObjectHideFlags: 0
@ -160,7 +161,7 @@ MonoBehaviour:
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.9616171, g: 1, b: 0, a: 1}
m_SelectedColor: {r: 0.9924528, g: 0.9924528, b: 0.9924528, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1

2
xiaofang/Assets/Prefabs/itemPrefabs/personnelFirstitem.prefab
View File

@ -523,6 +523,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
personelPanelText: {fileID: 5900002971283911308}
personelNumText: {fileID: 5900002969924403207}
lockText: {fileID: 0}
lockBg: {fileID: 0}
personelContent: {fileID: 5900002971599260874}
personelItem: {fileID: 6026028542083999128, guid: 93710d87e1c578748b4ef94ce0d38198, type: 3}
firstLablePrefab: {fileID: 0}

2
xiaofang/Assets/Prefabs/itemPrefabs/personnelSceneitem.prefab
View File

@ -725,7 +725,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 560.5, y: -44}
m_AnchoredPosition: {x: 560.5, y: -109}
m_SizeDelta: {x: 1121, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5900002971599260725

4
xiaofang/Assets/Scenes/Schedule_03.unity
View File

@ -11502,6 +11502,10 @@ PrefabInstance:
propertyPath: jsonReader
value:
objectReference: {fileID: 1417128757}
- target: {fileID: 9196293257107006895, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: WarningPopPanel
value:
objectReference: {fileID: 447504741}
- target: {fileID: 9196293257811847185, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3}
propertyPath: m_SizeDelta.x
value: -22.699951

25
xiaofang/Assets/Script/login/MyGlobal.cs
View File

@ -58,19 +58,18 @@ public class Response
}
public class loginData
{
public string userId;
public string scope;
public string openId;
public string companyId;
public string companyName;
public string isCreater;//是否是模板创建者，Y是则跳蓝湖预定演练01页面开始创建模板，N否则跳蓝狐回放1页面
public string access_token;
public string refresh_token;
public int expire_in;
public string refresh_expire_in;
public string client_id;
//public int expire_in;//toling剩余时间
public string userId; // 用户ID，标识用户的唯一身份。
public string scope; // 权限范围，描述当前用户的访问权限范围或操作权限。可能是某些资源的访问权限。
public string openId; // 用户的唯一标识，用于识别用户。通常用于开放平台授权登录的场景。
public string companyId; // 公司ID，标识所属公司的唯一ID。
public string companyName; // 公司名称，标识用户所属公司或组织的名称。
public string isCreater; // 是否为模板创建者，"Y"表示是模板创建者，"N"表示不是。影响用户跳转的页面逻辑。
public string access_token; // Access Token，用于认证用户身份，通常在OAuth 2.0中用于授权用户访问资源。
public string refresh_token; // Refresh Token，通常用于刷新Access Token，延长用户会话的有效期。
public int expire_in; // Access Token的过期时间（单位：秒）。表示token有效期时长。
public string refresh_expire_in; // Refresh Token的过期时间（单位：秒），表示Refresh Token的有效期时长。
public string client_id; // 客户端ID，用于标识请求的应用或服务。
}
public static class GlobalData
{

98
xiaofang/Assets/yhj/prefabs/ClassMateName.prefab
View File

@ -1,5 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2941886335356367877
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1402934767907770925}
- component: {fileID: 3577642907228721321}
- component: {fileID: 646037399500158430}
m_Layer: 5
m_Name: classText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1402934767907770925
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2941886335356367877}
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: 5469669078140634247}
m_RootOrder: 2
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: 102.78, y: -0.69678}
m_SizeDelta: {x: 334.44, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3577642907228721321
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2941886335356367877}
m_CullTransparentMesh: 1
--- !u!114 &646037399500158430
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2941886335356367877}
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: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &2980258574309763725
GameObject:
m_ObjectHideFlags: 0
@ -273,6 +353,7 @@ RectTransform:
m_Children:
- {fileID: 2980258575476095108}
- {fileID: 5469669078877023934}
- {fileID: 1402934767907770925}
- {fileID: 4182944296148239351}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -376,8 +457,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 86d3bfd11dab1c241900985b60ba6cf1, type: 3}
m_Name:
m_EditorClassIdentifier:
jueseChoicePop: {fileID: 0}
id: 0
name:
classmatename: {fileID: 5469669078877023921}
classText: {fileID: 0}
s:
otherButton: {fileID: 0}
button: {fileID: 5469669078140634246}
isBeSet: 1
--- !u!1 &5469669078877023935
GameObject:
m_ObjectHideFlags: 0
@ -390,7 +478,7 @@ GameObject:
- component: {fileID: 5469669078877023920}
- component: {fileID: 5469669078877023921}
m_Layer: 5
m_Name: Text
m_Name: playerText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -413,8 +501,8 @@ RectTransform:
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: 31.4758, y: -0.69675064}
m_SizeDelta: {x: 477.2962, y: 40}
m_AnchoredPosition: {x: -135.80934, y: -0.69675064}
m_SizeDelta: {x: 142.7261, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5469669078877023920
CanvasRenderer:
@ -457,7 +545,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u89D2\u8272\u540D2 \uFF084-2\uFF09 \u73ED\u540C\u5B66"
m_Text: "\u89D2\u8272\u540D2 "
--- !u!1 &7019925163220131350
GameObject:
m_ObjectHideFlags: 0
@ -489,7 +577,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5469669078140634247}
m_RootOrder: 2
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}

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

@ -10,6 +10,7 @@ public class ClassMate : MonoBehaviour
public int id;
public string name;
public Text classmatename;
public Text classText;
public string s;
public Button otherButton;
public Button button;

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

@ -80,7 +80,6 @@ public class JueseChoicePop : MonoBehaviour
string[] overseeParts = locationData.Oversee.Split(',');
string firstElement = overseeParts[0];
string lastElement = overseeParts[1];
if (overseeParts.Length > 0)
{
@ -91,7 +90,7 @@ public class JueseChoicePop : MonoBehaviour
Button button = item.GetComponent<Button>();
button.onClick.AddListener(() =>
{
// SetClassMate(classMate, scnenName);
//SetClassMate(classMate, );
});
classMate.name = info.name;
classMate.classmatename.text = classMate.name;
@ -110,7 +109,7 @@ public class JueseChoicePop : MonoBehaviour
public void SetClassMate(ClassMate classMate, string a = "")
{
this.classMate = classMate;
this.classMate.classmatename.text = classMate.name + "(" + a + ")";
this.classMate.classText.text = "(" + a + ")";
classMate.isBeSet = false;
}