diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 10ca27b..3abc20f 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -103,6 +103,7 @@ MonoBehaviour: - ShiNei - Scene - power + - Character m_SchemaTemplates: [] m_GroupTemplateObjects: - {fileID: 11400000, guid: 5417f84b420915e47980533e3395af40, type: 2} @@ -124,8 +125,4 @@ MonoBehaviour: m_RegisteredServiceTypeRefs: [] m_GlobalProfileVariablesInfos: - key: PrivateIpAddress - value: 192.168.1.163 - - key: PrivateIpAddress_1 - value: 192.168.35.1 - - key: PrivateIpAddress_2 - value: 192.168.221.1 + value: 192.168.1.34 diff --git a/Assets/AddressableAssetsData/AssetGroups/Character.asset b/Assets/AddressableAssetsData/AssetGroups/Character.asset index 8b29dd5..024a8f0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Character.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Character.asset @@ -20,23 +20,28 @@ MonoBehaviour: - m_GUID: d8bbdf5bd6ee8f24b881775c3144edfb m_Address: Character1 m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - Character - m_GUID: 7a294513afa47204c9507411c4513346 m_Address: Character2 m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - Character - m_GUID: e347f8acbdb0b3c48b8f6384ee73876b m_Address: Character3 m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - Character - m_GUID: 040aa914476488341b8607ab722d70b8 m_Address: Character4 m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - Character - m_GUID: 8e19764848df1674ba385a0af8386fb9 m_Address: Character5 m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - Character - m_GUID: 1eb551d1186059b47a2110f01a968f2f m_Address: YBot m_ReadOnly: 0 diff --git a/Assets/Common/UIViews/PersonnelLocationMenuPanel.prefab b/Assets/Common/UIViews/PersonnelLocationMenuPanel.prefab index f6d3cbf..4c10758 100644 --- a/Assets/Common/UIViews/PersonnelLocationMenuPanel.prefab +++ b/Assets/Common/UIViews/PersonnelLocationMenuPanel.prefab @@ -420,7 +420,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 + m_IsOn: 1 --- !u!1 &3618049468631825109 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +557,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ViewType: 0 + startToggle: {fileID: 7258546201478757948} + broomButton: {fileID: 8288139996731006132} + displayToggle: {fileID: 5465367584754234644} + saveToggle: {fileID: 9125485210189098349} + saveButton: {fileID: 3055576792177378692} --- !u!1 &6403670027434369231 GameObject: m_ObjectHideFlags: 0 @@ -886,6 +891,18 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!114 &7258546201478757948 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 1043810148363852483} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1339583546896267403 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, @@ -1102,6 +1119,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba64ffd61e6b4934f9b2796cd03dc9ff, type: 3} +--- !u!114 &8288139996731006132 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5681478534539153602, guid: ba64ffd61e6b4934f9b2796cd03dc9ff, + type: 3} + m_PrefabInstance: {fileID: 4457941076592643190} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &813485672696701276 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3933855941876362538, guid: ba64ffd61e6b4934f9b2796cd03dc9ff, @@ -1459,6 +1488,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7259587401522058566} m_PrefabAsset: {fileID: 0} +--- !u!114 &3055576792177378692 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5681478534539153602, guid: ba64ffd61e6b4934f9b2796cd03dc9ff, + type: 3} + m_PrefabInstance: {fileID: 7259587401522058566} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8588438058106573908 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Common/UIViews/PersonnelLocationPanel.prefab b/Assets/Common/UIViews/PersonnelLocationPanel.prefab index 35ead82..dd060cc 100644 --- a/Assets/Common/UIViews/PersonnelLocationPanel.prefab +++ b/Assets/Common/UIViews/PersonnelLocationPanel.prefab @@ -309,8 +309,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1108714811974773912} - - {fileID: 1788210760186998581} - {fileID: 491579278763256966} + - {fileID: 8896062278149297227} m_Father: {fileID: 6832783550372137578} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -319,6 +319,205 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: -20, y: -50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1341807907793625632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8896062278149297227} + - component: {fileID: 6799251814161869321} + - component: {fileID: 1398194524598831528} + - component: {fileID: 8926357198369761058} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8896062278149297227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341807907793625632} + 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_Children: + - {fileID: 1788210760186998581} + - {fileID: 2988381960072960147} + - {fileID: 7759634132585650934} + m_Father: {fileID: 1743942256352112141} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 0, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6799251814161869321 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341807907793625632} + m_CullTransparentMesh: 0 +--- !u!114 &1398194524598831528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341807907793625632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8926357198369761058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341807907793625632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6efa8ca7fab1cb4fa26add447824b92, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 5897541069319522633} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 30 + m_Viewport: {fileID: 2988381960072960147} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1865621650576251489} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + itemTemplate: {fileID: 0} +--- !u!1 &1674835338659540955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2988381960072960147} + - component: {fileID: 6423208913481552625} + - component: {fileID: 5317615490490269623} + - component: {fileID: 2143395173021331601} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2988381960072960147 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674835338659540955} + 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_Children: + - {fileID: 5897541069319522633} + m_Father: {fileID: 8896062278149297227} + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6423208913481552625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674835338659540955} + m_CullTransparentMesh: 0 +--- !u!114 &5317615490490269623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674835338659540955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7671531259818662440, guid: 1724ec1a745a80f44aae3d014e04f5cc, + type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2143395173021331601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674835338659540955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &1766314350338557081 GameObject: m_ObjectHideFlags: 0 @@ -497,8 +696,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ViewType: 0 + numbsrs: alarmScrollView: {fileID: 2325256889193168066} - employeeScrollView: {fileID: 5734836025923746995} + employeeScrollView: {fileID: 8926357198369761058} locationCards: [] items: [] showAll: {fileID: 922339829333665249} @@ -580,6 +780,96 @@ MonoBehaviour: time: {fileID: 1467024905560526636} alarmIcon: {fileID: 1699937862627213889} detailsButton: {fileID: 2092928453035713909} +--- !u!1 &3160483726207073599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5897541069319522633} + - component: {fileID: 8413078406590609898} + - component: {fileID: 3720833862665627152} + - component: {fileID: 9183620373622822547} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5897541069319522633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160483726207073599} + 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_Children: [] + m_Father: {fileID: 2988381960072960147} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &8413078406590609898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160483726207073599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowSwitchOff: 1 +--- !u!114 &3720833862665627152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160483726207073599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &9183620373622822547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160483726207073599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &3495462249791581131 GameObject: m_ObjectHideFlags: 0 @@ -691,7 +981,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 450} + m_SizeDelta: {x: 350, y: 300} m_Pivot: {x: 0, y: 1} --- !u!222 &5362743036923309004 CanvasRenderer: @@ -742,6 +1032,7 @@ GameObject: - component: {fileID: 6299439787863527401} - component: {fileID: 8032935396841719285} - component: {fileID: 6299082460323460380} + - component: {fileID: 5101799560007362632} m_Layer: 5 m_Name: Menu m_TagString: Untagged @@ -799,41 +1090,179 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6299082460323460380 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4180503095572515595} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6299082460323460380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4180503095572515595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &5101799560007362632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4180503095572515595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowSwitchOff: 1 +--- !u!1 &4451671868453524261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7759634132585650934} + - component: {fileID: 1916846959027414762} + - component: {fileID: 6068207091018215016} + - component: {fileID: 1865621650576251489} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7759634132585650934 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4451671868453524261} + 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_Children: + - {fileID: 1169255755526583454} + m_Father: {fileID: 8896062278149297227} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &1916846959027414762 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4451671868453524261} + m_CullTransparentMesh: 0 +--- !u!114 &6068207091018215016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4451671868453524261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7671531259818662440, guid: 1724ec1a745a80f44aae3d014e04f5cc, + type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1865621650576251489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4451671868453524261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5411684925061401458} + m_HandleRect: {fileID: 6412881485974725881} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5004848137661470863 GameObject: m_ObjectHideFlags: 0 @@ -983,6 +1412,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5709459342357061654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6412881485974725881} + - component: {fileID: 2393797350600017120} + - component: {fileID: 5411684925061401458} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6412881485974725881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5709459342357061654} + 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_Children: [] + m_Father: {fileID: 1169255755526583454} + 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_SizeDelta: {x: 10, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2393797350600017120 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5709459342357061654} + m_CullTransparentMesh: 0 +--- !u!114 &5411684925061401458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5709459342357061654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21568628, g: 0.94509804, b: 1, a: 0.3254902} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 7671531259818662440, guid: 1724ec1a745a80f44aae3d014e04f5cc, + type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5740262743179364878 GameObject: m_ObjectHideFlags: 0 @@ -1019,8 +1523,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -460} - m_SizeDelta: {x: 350, y: -460} + m_AnchoredPosition: {x: 0, y: -310} + m_SizeDelta: {x: 350, y: -310} m_Pivot: {x: 0, y: 1} --- !u!222 &8659861812066597534 CanvasRenderer: @@ -1135,6 +1639,101 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6334279502554715103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1169255755526583454} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1169255755526583454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6334279502554715103} + 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_Children: + - {fileID: 6412881485974725881} + m_Father: {fileID: 7759634132585650934} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2071586752881313626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6336015375688237220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7351420106350689890} + toggleTransition: 1 + graphic: {fileID: 0} + m_Group: {fileID: 5101799560007362632} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 +--- !u!114 &5944506450430191394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6336015375688237220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4d6229f9fc4f254f8996f989208f88d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7195176339030721045 GameObject: m_ObjectHideFlags: 0 @@ -1234,7 +1833,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7557366595351307559} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: @@ -1242,12 +1841,12 @@ RectTransform: - {fileID: 179092984280692916} - {fileID: 5339718141435687345} - {fileID: 6417427325566406491} - m_Father: {fileID: 1743942256352112141} - m_RootOrder: 1 + m_Father: {fileID: 8896062278149297227} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -33.2} + m_AnchoredPosition: {x: 0, y: 6.799988} m_SizeDelta: {x: 330, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2971717089078253743 @@ -1427,7 +2026,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7208728649964031533} toggleTransition: 1 graphic: {fileID: 3539918554678520590} - m_Group: {fileID: 485229437204584711} + m_Group: {fileID: 8413078406590609898} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -2061,12 +2660,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a7f35ec8e38d16469abba24b7d88a24, type: 3} +--- !u!1 &6336015375688237220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5587035623055505194, guid: 8a7f35ec8e38d16469abba24b7d88a24, + type: 3} + m_PrefabInstance: {fileID: 1902541208461424526} + m_PrefabAsset: {fileID: 0} --- !u!224 &179092984280692916 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1737099973456170810, guid: 8a7f35ec8e38d16469abba24b7d88a24, type: 3} m_PrefabInstance: {fileID: 1902541208461424526} m_PrefabAsset: {fileID: 0} +--- !u!114 &7351420106350689890 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8962816939694017004, guid: 8a7f35ec8e38d16469abba24b7d88a24, + type: 3} + m_PrefabInstance: {fileID: 1902541208461424526} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6336015375688237220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2743875761984857735 PrefabInstance: m_ObjectHideFlags: 0 @@ -2272,12 +2889,12 @@ PrefabInstance: - target: {fileID: 3709271829403358373, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271829403358373, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271829403358373, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} @@ -2287,17 +2904,17 @@ PrefabInstance: - target: {fileID: 3709271830102431828, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_SizeDelta.y - value: 410 + value: 560 objectReference: {fileID: 0} - target: {fileID: 3709271830102431828, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000032608674 + value: -0.000040706283 objectReference: {fileID: 0} - target: {fileID: 3709271830637054747, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_Size - value: 0.9980636 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271830637054747, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} @@ -2317,7 +2934,7 @@ PrefabInstance: - target: {fileID: 3709271830742558232, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271830742558232, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} @@ -2414,20 +3031,25 @@ PrefabInstance: propertyPath: m_Name value: EmployeeScrollView objectReference: {fileID: 0} + - target: {fileID: 3709271830742558233, guid: a3c05a63b89cee44294ee69c283ebaa2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3709271830862119990, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271830862119990, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271830862119990, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8808391433916102189, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} @@ -2442,34 +3064,10 @@ PrefabInstance: - target: {fileID: 8808391433916102189, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: defaultItemSize.y - value: 30 + value: 40 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} ---- !u!114 &5734836025923746995 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8808391433916102189, guid: a3c05a63b89cee44294ee69c283ebaa2, - type: 3} - m_PrefabInstance: {fileID: 3867338276807740062} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2d355eec575560046ba27246695b84ad, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &485229437204584711 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3679557676129440665, guid: a3c05a63b89cee44294ee69c283ebaa2, - type: 3} - m_PrefabInstance: {fileID: 3867338276807740062} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &491579278763256966 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3709271830742558232, guid: a3c05a63b89cee44294ee69c283ebaa2, @@ -2913,20 +3511,25 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3709271829403358373, guid: a3c05a63b89cee44294ee69c283ebaa2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3709271830102431828, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_SizeDelta.y - value: 400 + value: 250 objectReference: {fileID: 0} - target: {fileID: 3709271830102431828, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00004671706 + value: 0.000060677903 objectReference: {fileID: 0} - target: {fileID: 3709271830637054747, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} propertyPath: m_Size - value: 0.9980637 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3709271830637054747, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} @@ -3075,12 +3678,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3c05a63b89cee44294ee69c283ebaa2, type: 3} ---- !u!224 &7566243735056362743 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3709271830742558232, guid: a3c05a63b89cee44294ee69c283ebaa2, - type: 3} - m_PrefabInstance: {fileID: 6519322772094241519} - m_PrefabAsset: {fileID: 0} --- !u!114 &2325256889193168066 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8808391433916102189, guid: a3c05a63b89cee44294ee69c283ebaa2, @@ -3093,6 +3690,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2d355eec575560046ba27246695b84ad, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7566243735056362743 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3709271830742558232, guid: a3c05a63b89cee44294ee69c283ebaa2, + type: 3} + m_PrefabInstance: {fileID: 6519322772094241519} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6580514589447396437 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Avatars/655bfb84751f07df925ce565/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Top.mat b/Assets/Ready Player Me/Avatars/655bfb84751f07df925ce565/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Top.mat index 53f312d..382a5bb 100644 --- a/Assets/Ready Player Me/Avatars/655bfb84751f07df925ce565/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Top.mat +++ b/Assets/Ready Player Me/Avatars/655bfb84751f07df925ce565/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Top.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Ready Player Me/Avatars/655bfcac751f07df925ce93b/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Footwear.mat b/Assets/Ready Player Me/Avatars/655bfcac751f07df925ce93b/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Footwear.mat index b4321e7..b71e450 100644 --- a/Assets/Ready Player Me/Avatars/655bfcac751f07df925ce93b/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Footwear.mat +++ b/Assets/Ready Player Me/Avatars/655bfcac751f07df925ce93b/2fac66e374c947c41bc74325c6e3d934/Materials/Wolf3D_Outfit_Footwear.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Ready Player Me/Characters/Character3.prefab b/Assets/Ready Player Me/Characters/Character3.prefab index af7afe4..2cfd590 100644 --- a/Assets/Ready Player Me/Characters/Character3.prefab +++ b/Assets/Ready Player Me/Characters/Character3.prefab @@ -703,6 +703,84 @@ Transform: m_Father: {fileID: 8995483499004773591} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1253293950284996107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7936141959497646763} + - component: {fileID: 7837325763347143269} + - component: {fileID: 3354433202138298091} + m_Layer: 6 + m_Name: CurrentTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7936141959497646763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253293950284996107} + 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_Children: [] + m_Father: {fileID: 5803787952475391710} + m_RootOrder: 1 + 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: 0, y: -21.999836} + m_SizeDelta: {x: 280, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7837325763347143269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253293950284996107} + m_CullTransparentMesh: 1 +--- !u!114 &3354433202138298091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253293950284996107} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: decc468d4945aa245a133e054cecdffe, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u65F6\u95F4\uFF1A----" --- !u!1 &1282600682866572984 GameObject: m_ObjectHideFlags: 0 @@ -733,6 +811,84 @@ Transform: m_Father: {fileID: 59782930292197315} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1352309560014824294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2733968709175242191} + - component: {fileID: 3338933020753609193} + - component: {fileID: 3181397855239458770} + m_Layer: 6 + m_Name: CardNumber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2733968709175242191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352309560014824294} + 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_Children: [] + m_Father: {fileID: 5803787952475391710} + m_RootOrder: 0 + 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: -20.59, y: 25} + m_SizeDelta: {x: 238.82, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3338933020753609193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352309560014824294} + m_CullTransparentMesh: 1 +--- !u!114 &3181397855239458770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352309560014824294} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: decc468d4945aa245a133e054cecdffe, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5361\u53F7\uFF1A----" --- !u!1 &1411653740474393483 GameObject: m_ObjectHideFlags: 0 @@ -764,6 +920,124 @@ Transform: m_Father: {fileID: 7787422749887971998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1478725514097409798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3216045419867727480} + - component: {fileID: 5211678578744829183} + - component: {fileID: 8621823869144808824} + - component: {fileID: 8049631444855829249} + m_Layer: 6 + m_Name: Video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3216045419867727480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478725514097409798} + 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_Children: [] + m_Father: {fileID: 5803787952475391710} + 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} + m_AnchoredPosition: {x: 86.6, y: 26.1} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211678578744829183 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478725514097409798} + m_CullTransparentMesh: 1 +--- !u!114 &8621823869144808824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478725514097409798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.23137255, g: 1, b: 0.87058824, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f2600680bf07db2468f8db5e68ecc214, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8049631444855829249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478725514097409798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8621823869144808824} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1657681275389530736 GameObject: m_ObjectHideFlags: 0 @@ -1221,6 +1495,202 @@ SkinnedMeshRenderer: m_Center: {x: -0.00031304013, y: 0.0070829215, z: 0.00067709177} m_Extent: {x: 0.00019083972, y: 0.00019352091, z: 0.000100991165} m_DirtyAABB: 0 +--- !u!1 &2932643158465236017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5803787952475391710} + - component: {fileID: 8355896249043265956} + - component: {fileID: 2779421238845948204} + m_Layer: 6 + m_Name: Info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5803787952475391710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932643158465236017} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2733968709175242191} + - {fileID: 7936141959497646763} + - {fileID: 8173193638043135125} + - {fileID: 3216045419867727480} + m_Father: {fileID: 5793995970507278427} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8355896249043265956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932643158465236017} + m_CullTransparentMesh: 1 +--- !u!114 &2779421238845948204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2932643158465236017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.94509804} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0492ee65b96618d419d541a35ec78812, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2991728023648134044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8173193638043135125} + - component: {fileID: 3187255942514214798} + - component: {fileID: 6609989263067698082} + - component: {fileID: 754835583514343858} + m_Layer: 6 + m_Name: TrackPlayback + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8173193638043135125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991728023648134044} + 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_Children: [] + m_Father: {fileID: 5803787952475391710} + 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: 126.4, y: 26.1} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3187255942514214798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991728023648134044} + m_CullTransparentMesh: 1 +--- !u!114 &6609989263067698082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991728023648134044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.23137255, g: 1, b: 0.87058824, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5a105fe12e6c52d4db49fa5a196556eb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &754835583514343858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2991728023648134044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + 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.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6609989263067698082} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3022917502244957558 GameObject: m_ObjectHideFlags: 0 @@ -2428,6 +2898,8 @@ Transform: - {fileID: 4320446070723389750} - {fileID: 2272124404761462963} - {fileID: 2658543845569417396} + - {fileID: 5793995970507278427} + - {fileID: 3802304557581004169} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3497,6 +3969,105 @@ Transform: m_Father: {fileID: 6352287792397335947} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7485539193214602472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5793995970507278427} + - component: {fileID: 2000977881733286374} + - component: {fileID: 6927469162861832829} + - component: {fileID: 9198950481384337441} + m_Layer: 6 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5793995970507278427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485539193214602472} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.003, y: 0.003, z: 0.003} + m_Children: + - {fileID: 5803787952475391710} + m_Father: {fileID: 3321855426629495794} + m_RootOrder: 10 + 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: 1.834} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &2000977881733286374 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485539193214602472} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6927469162861832829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485539193214602472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &9198950481384337441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485539193214602472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &7504334512332770023 GameObject: m_ObjectHideFlags: 0 @@ -3801,6 +4372,36 @@ Transform: m_Father: {fileID: 954798804449763053} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7877354992680173180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3802304557581004169} + m_Layer: 6 + m_Name: Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3802304557581004169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7877354992680173180} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.983, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3321855426629495794} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7892712727701810483 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Characters/YBot.prefab b/Assets/Ready Player Me/Characters/YBot.prefab index 073ad8e..d5c7d84 100644 --- a/Assets/Ready Player Me/Characters/YBot.prefab +++ b/Assets/Ready Player Me/Characters/YBot.prefab @@ -317,7 +317,7 @@ TrailRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5a99d53c80950304f8eccd5b84930c7f, type: 2} + - {fileID: 2100000, guid: 04d7395836f5e3a49a496ebeb89faa54, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index 7dffc7e..1481d4d 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -49,7 +49,7 @@ public class GameManager : Singleton Config.Interval = webConfig.Interval; Config.AlarmServer = webConfig.AlarmServer; Config.AlarmInterval = webConfig.AlarmInterval; - Debug.Log("ServerAddress" + Config.ServerAddress); + Debug.Log("ServerAddress:" + Config.ServerAddress+" Interval:"+Config.Interval+" Range:"+Config.Range); } }); diff --git a/Assets/Scripts/EmployeeScrollView.cs b/Assets/Scripts/EmployeeScrollView.cs new file mode 100644 index 0000000..953e3fe --- /dev/null +++ b/Assets/Scripts/EmployeeScrollView.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +[RequireComponent(typeof(RectTransform))] +[DisallowMultipleComponent] +public class EmployeeScrollView : ScrollRect +{ + [SerializeField] + public RectTransform itemTemplate; + + public void SetUpdateFunc(List list,Action action) + { + if(itemTemplate == null) + itemTemplate = transform.Find("Item").GetComponent(); + ClearData(); + int i = 0; + foreach (var item in list) + { + GameObject go = Instantiate(itemTemplate.gameObject,content.transform); + go.SetActive(true); + action?.Invoke(i,go); + i++; + } + } + + private void ClearData() + { + foreach (Transform item in content.transform) + { + Destroy(item.gameObject); + } + } +} diff --git a/Assets/Scripts/EmployeeScrollView.cs.meta b/Assets/Scripts/EmployeeScrollView.cs.meta new file mode 100644 index 0000000..1375e8e --- /dev/null +++ b/Assets/Scripts/EmployeeScrollView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6efa8ca7fab1cb4fa26add447824b92 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Core/EventManager/EventManager.cs b/Assets/Scripts/Main/Core/EventManager/EventManager.cs index 5fb795c..7bfd6bf 100644 --- a/Assets/Scripts/Main/Core/EventManager/EventManager.cs +++ b/Assets/Scripts/Main/Core/EventManager/EventManager.cs @@ -15,9 +15,6 @@ public class EventManager : MonoBehaviour public event Action OnStopLocation; //显示轨迹 public event Action OnShowTrajectories; - - public event Action OnMainCameraActive; - public event Action OnFollowCameraActive; //人员列表Toggle public event Action OnEmployeeItemActive; public event Action OnEmployeeActive; @@ -31,16 +28,6 @@ public class EventManager : MonoBehaviour { OnEmployeeItemActive?.Invoke(isOn); } - public void MainCameraActive() - { - OnMainCameraActive?.Invoke(); - } - - public void FollowCameraActive() - { - OnFollowCameraActive?.Invoke(); - } - /// /// 清除轨迹 /// diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs b/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs index 5131c7d..875b80a 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs @@ -27,24 +27,9 @@ public class AgentController : MonoBehaviour private void Start() { - //Main.Event.OnMainCameraActive += OnMainCameraActive; - //Main.Event.OnFollowCameraActive += OnFollowCameraActive; - } - - /// - /// 当第一人称摄影机被激活后，Canvas的摄影机切为第一人称 - /// - private void OnFollowCameraActive() - { - //canvas.worldCamera = CameraManager.FollowCamera.GetComponent(); - } - /// - /// 当上帝视角被激活后，Canvas的摄影机切为全局相机 - /// - private void OnMainCameraActive() - { - //canvas.worldCamera = CameraManager.MainCamera.GetComponent(); + canvas.worldCamera = CameraOrbit.Instance.GetComponent(); } + private void Update() { @@ -238,12 +223,4 @@ public class AgentController : MonoBehaviour }); } - private void OnDestroy() - { - //if (Main.Event == null) - // return; - //Main.Event.OnMainCameraActive -= OnMainCameraActive; - //Main.Event.OnFollowCameraActive -= OnFollowCameraActive; - } - } diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/AlarmData.cs b/Assets/Scripts/Main/Core/PersonnelLocation/AlarmData.cs index ccee7d0..943256f 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/AlarmData.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/AlarmData.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEngine; [Serializable] -public class AlarmData : MonoBehaviour +public class AlarmData { public int ErrorCode { get; set; } public List List { get; set; } diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs b/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs index e263a78..6a1c87f 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json; using System; using System.Collections; using System.Collections.Generic; @@ -8,17 +9,16 @@ public class LocationSimulator : MonoBehaviour //定位人员 private Dictionary agentControllers = new Dictionary(); //历史数据 - private List historyData = new List(); + public List historyData = new List(); //是否保存历史数据 public bool isSaveHistory; //轨迹回放人员 private GameObject trackAgent; //轨迹回放数据 - private List trackLocationData; + public List trackLocationData; //轨迹回放Coroutines private List trackCoroutines = new List(); public LayerMask layerMask = -1; - private const string HistoryDataFilePath = "HistortData.json"; private int characterCount = 0; /// @@ -48,8 +48,16 @@ public class LocationSimulator : MonoBehaviour { if (isSaveHistory) { - //var url = $"{Application.streamingAssetsPath}/{HistoryDataFilePath}"; - //QuickSaveRaw.Save(url, historyData); + var url = HttpManager.Instance.PostPersonnelHistoryData; + Dictionary postData = new Dictionary(); + int i = 0; + foreach (var data in historyData) + { + string json = JsonConvert.SerializeObject(data); + postData.Add(i.ToString(), json); + i++; + } + HttpManager.Instance.Post (url, postData); } } @@ -62,11 +70,14 @@ public class LocationSimulator : MonoBehaviour if (isOn) { - trackLocationData = LoadTrackData(targetNo); - if (trackLocationData.Count > 0) + LoadTrackData(targetNo, data => { - StartTrackPlayback(); - } + trackLocationData = data; + if (trackLocationData.Count > 0) + { + StartTrackPlayback(); + } + }); } else { @@ -78,25 +89,26 @@ public class LocationSimulator : MonoBehaviour /// /// /// - private List LoadTrackData(long targetNo) + private void LoadTrackData(long targetNo,Action> action) { - //string url = $"{Application.streamingAssetsPath}/{HistoryDataFilePath}"; - //var tempData = QuickSaveRaw.Load>(url); - var loadedData = new List(); - - //foreach (var item in tempData) - //{ - // var data = item.list.Find(d => d.targetNo == targetNo); - // if (data != null) - // { - // if (trackAgent == null) - // { - // InitializeTrackAgent(data); - // } - // loadedData.Add(data); - // } - //} - return loadedData; + var url = HttpManager.Instance.GetPersonnelHistoryData; + HttpManager.Instance.Get>(url, tempData => + { + var loadedData = new List(); + foreach (var item in tempData) + { + var data = item.list.Find(d => d.targetNo == targetNo); + if (data != null) + { + if (trackAgent == null) + { + InitializeTrackAgent(data); + } + loadedData.Add(data); + } + } + action?.Invoke(loadedData); + }); } /// /// 根据数据初始化定位人员 @@ -104,8 +116,7 @@ public class LocationSimulator : MonoBehaviour /// private void InitializeTrackAgent(LocationData data) { - //trackAgent = Instantiate(characterTrack); - trackAgent = Instantiate(Resources.Load("Characters/YBot")) as GameObject; + trackAgent = Instantiate(AssetManager.Instance.yBot) as GameObject; trackAgent.name = "YBotAgent"; Vector3 pos = ConversionTransform(data); trackAgent.transform.position = pos; @@ -163,9 +174,6 @@ public class LocationSimulator : MonoBehaviour if (trackAgent != null) { // 设置位置 - //var position = new Vector3(-(float)currentLocation.xAxis, 0f, -(float)currentLocation.yAxis); - //position.y = SetY(trackAgent.transform.position); - //trackAgent.GetComponent().MoveTo(position, currentLocation.createdTime, currentLocation.targetNo); trackAgent.GetComponent().UpdatePosition(trackLocationData[i]); } @@ -258,11 +266,10 @@ public class LocationSimulator : MonoBehaviour /// private AgentController CreateAgent(LocationData data) { - if (characterCount > 5) + + if (characterCount > 4) characterCount = 0; - //var obj = Instantiate(character); - characterCount++; - var obj = Instantiate(Resources.Load($"Characters/Character{characterCount}")) as GameObject; + var obj = Instantiate(AssetManager.Instance.characters[characterCount]) as GameObject; var pos = ConversionTransform(data); obj.transform.position = pos; obj.name = $"Agent {data.targetNo}"; @@ -273,6 +280,7 @@ public class LocationSimulator : MonoBehaviour controller.ShowStatus(data.createdTime, data.targetNo); controller.SetToNvMesh(pos); SetActive(obj,data); + characterCount++; return controller; } @@ -283,12 +291,12 @@ public class LocationSimulator : MonoBehaviour /// private void SetActive(GameObject agent, LocationData data) { - //var panel = UIManager.Instance.GetView(); - //var item = panel.items.Find(go => go.name == data.targetNo.ToString()); - //if(item != null) - //{ - // agent.SetChildrenActive(item.show.isOn); - //} + var panel = UIManager.Instance.GetView(); + var item = panel.items.Find(go => go.name == data.targetNo.ToString()); + if (item != null) + { + agent.SetChildrenActive(item.show.isOn); + } } /// /// 根据数据转换到Unity坐标 @@ -306,27 +314,6 @@ public class LocationSimulator : MonoBehaviour var pos = new Vector3(-(float)data.xAxis, y, -(float)data.yAxis/1.057f); pos.y = SetY(pos); - if(data.stations.Contains("1040,1150")) - { - pos.z = 6.25f; - if (pos.x < 7.5f) - pos.x = 7.5f; - if(pos.x>15) - pos.x = 15; - } - - if (data.stations.Contains("1040,1020")) - { - pos.z = 8.15f; - if (pos.x < 7.5f) - pos.x = 7.5f; - if (pos.x > 14.5f) - pos.x = 14.5f; - } - - if (data.stations.Contains("1160")) - pos.z = 4.65f; - return pos; } diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs b/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs new file mode 100644 index 0000000..7865e91 --- /dev/null +++ b/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using UnityEngine.UI; + +public class NumberToggle : MonoBehaviour +{ + private Text text; + private Toggle toggle; + private long targetNo; + + private void Start() + { + text = GetComponent(); + toggle = GetComponent(); + targetNo=long.Parse(text.text); + + toggle.onValueChanged.AddListener(v => OnValueChanged(v)); + } + + private void OnValueChanged(bool v) + { + if (v) + { + text.color = Color.cyan; + Main.Event.HideTrack(); + Main.Event.ZoomIn(targetNo); + } + else + { + text.color = Color.white; + Main.Event.ShowTrack(); + SelectionManager.Instance.ClearSelection(); + + } + } +} diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs.meta b/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs.meta new file mode 100644 index 0000000..5451070 --- /dev/null +++ b/Assets/Scripts/Main/Core/PersonnelLocation/NumberToggle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4d6229f9fc4f254f8996f989208f88d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/TrackWorkController.cs b/Assets/Scripts/Main/Core/PersonnelLocation/TrackWorkController.cs index c8ce085..a69c17f 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/TrackWorkController.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/TrackWorkController.cs @@ -9,13 +9,18 @@ public class TrackWorkController : MonoBehaviour private void Start() { - //targetNo = GetComponent().targetNo; - //CameraManager.MainCamera.GetComponent().SetView(transform.Find("Pivot").position, 3f); - //Main.Selection.AddGameObjectToSelection(this.gameObject); + targetNo = GetComponent().targetNo; + CameraOrbit.Instance.SetCameraView(transform.Find("Pivot").position, 3f); + SelectionManager.Instance.AddGameObjectToSelection(this.gameObject); - //closeButton.onClick.AddListener(() => - //{ - // MessageDispatcher.SendMessage("TRACKPLAYBACK", false, targetNo.ToString()); - //}); + closeButton.onClick.AddListener(() => + { + MessageDispatcher.SendMessage("TRACKPLAYBACK", false, targetNo.ToString()); + }); + } + + private void OnDestroy() + { + SelectionManager.Instance.ClearSelection(); } } diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs b/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs index eec78ae..8344588 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs @@ -10,11 +10,8 @@ public class WorkAIController : MonoBehaviour public long targetNo; private bool isShow = true; - private void Start() + private void Awake() { - trackButton = transform.Find("Canvas/Info/TrackPlayback").GetComponent