diff --git a/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab b/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab new file mode 100644 index 000000000..87bdbe275 --- /dev/null +++ b/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab @@ -0,0 +1,457 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4209896323728329981 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 100000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Name + value: test + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100010, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100012, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100014, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100016, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100018, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100020, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100022, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100024, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100026, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100028, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100030, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100032, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100034, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100036, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100038, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100040, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100042, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100044, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100046, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100048, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100050, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100052, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100054, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100056, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100058, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100060, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100062, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100064, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100066, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100068, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100070, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100072, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100074, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100076, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100078, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100080, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100082, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100084, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100086, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100088, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100090, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100092, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100094, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100096, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100098, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100100, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100102, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100104, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100106, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100108, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100110, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100112, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100114, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100116, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100118, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100120, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100122, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100124, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100126, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100128, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100130, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100132, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100134, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100136, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100138, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100140, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100142, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100144, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100146, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100148, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100150, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100152, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100154, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100156, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100158, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100160, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100162, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100164, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100166, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100168, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100170, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100172, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100174, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100176, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100178, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 100180, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_Layer + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 2543095689095286198} + m_SourcePrefab: {fileID: 100100000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} +--- !u!1 &4209896323728362077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 87d06d04f2d65d9428debc0b3b5bf4e2, type: 3} + m_PrefabInstance: {fileID: 4209896323728329981} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2543095689095286198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4209896323728362077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 897c0165284148879a9d158ea8010a15, type: 3} + m_Name: + m_EditorClassIdentifier: + zoom: + canZoom: 1 + zoom: 5 + zoomMin: 1 + zoomMax: 15 + pan: + canPan: 1 + x: 2 + y: 2 + rotation: {x: 0, y: 120, z: 0} + hookPoints: [] + rotateVeloMaxAngle: 10 + rotateVeloMaxSpeed: 3 + rotationInFishJaw: {x: 0, y: 0, z: 0} diff --git a/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab.meta b/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab.meta new file mode 100644 index 000000000..6c3df0030 --- /dev/null +++ b/Assets/Plugins/FairyGUI/Examples/Resources/Role/test.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f7eb8b6350a6aef47a46e68e3695710e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423.prefab b/Assets/Resources/gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423.prefab index 0fb91694c..b5371553b 100644 --- a/Assets/Resources/gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423.prefab +++ b/Assets/Resources/gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423.prefab @@ -80,6 +80,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b6eea50c041f42d5bd95d9e56c3a9c6f, type: 3} m_Name: m_EditorClassIdentifier: + zoom: + canZoom: 1 + zoom: 3 + zoomMin: 1 + zoomMax: 5 + pan: + canPan: 1 + x: 2 + y: 2 + rotation: {x: 0, y: 0, z: 0} baitConnector: {fileID: 4966382469295925} --- !u!65 &522805033838897550 BoxCollider: diff --git a/Assets/Scenes/StartUp.unity b/Assets/Scenes/StartUp.unity index d339c7a2e..4bebbf939 100644 --- a/Assets/Scenes/StartUp.unity +++ b/Assets/Scenes/StartUp.unity @@ -458,7 +458,7 @@ GameObject: - component: {fileID: 410087040} - component: {fileID: 410087042} m_Layer: 0 - m_Name: Directional Light + m_Name: PreviewLight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -481,7 +481,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -512,7 +512,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 4194304 m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 @@ -542,7 +542,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 6098876000977740681} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &410087042 MonoBehaviour: @@ -989,6 +989,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 375624857} + - {fileID: 410087041} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &6620360613922641342 @@ -1058,7 +1059,6 @@ MonoBehaviour: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 410087041} - {fileID: 832575519} - {fileID: 1810378424} - {fileID: 6098876000977740681} diff --git a/Assets/Scripts/Fishing/New/Assets/PreviewableAsset.cs b/Assets/Scripts/Fishing/New/Assets/PreviewableAsset.cs index c60007d58..7e9754551 100644 --- a/Assets/Scripts/Fishing/New/Assets/PreviewableAsset.cs +++ b/Assets/Scripts/Fishing/New/Assets/PreviewableAsset.cs @@ -34,5 +34,6 @@ namespace NBF [Tooltip("放大缩小配置")] public ModelZoomConfig zoom; [Tooltip("平移配置")] public ModelPanConfig pan; [Tooltip("默认旋转")] public Vector3 rotation; + [Tooltip("默认形变")] public Vector3 scale; } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/ModelRenderImage.cs b/Assets/Scripts/UI/Common/ModelRenderImage.cs index c5b2fdd4b..bcfb2acf5 100644 --- a/Assets/Scripts/UI/Common/ModelRenderImage.cs +++ b/Assets/Scripts/UI/Common/ModelRenderImage.cs @@ -20,8 +20,8 @@ namespace NBF bool _cacheTexture; Vector3 _rotating; - const int RENDER_LAYER = 0; - const int HIDDEN_LAYER = 10; + const int RENDER_LAYER = 22; + const int HIDDEN_LAYER = 0; public ModelRenderImage(GGraph holder) { @@ -187,21 +187,16 @@ namespace NBF return uvRect; } - public GameObject LoadModel(string model) + public void SetModel(GameObject model) { this.UnloadModel(); - - Object prefab = Resources.Load(model); - GameObject go = ((GameObject)Object.Instantiate(prefab)); - _model = go.transform; + _model = model.transform; _model.SetParent(this.modelRoot, false); - var h = CalculateModelHeight(go); //计算包围盒高度 + var h = CalculateModelHeight(model); //计算包围盒高度 var pos = _model.localPosition; _model.localPosition = new Vector3(pos.x, pos.y - h * 0.5f, pos.z); - - return go; } - + public void UnloadModel() { if (_model != null) diff --git a/Assets/Scripts/UI/Common/ModelTexture.cs b/Assets/Scripts/UI/Common/ModelTexture.cs index afce08ab5..748edce13 100644 --- a/Assets/Scripts/UI/Common/ModelTexture.cs +++ b/Assets/Scripts/UI/Common/ModelTexture.cs @@ -4,6 +4,7 @@ using System; using UnityEngine; using FairyGUI; using NBC; +using Object = UnityEngine.Object; namespace NBF { @@ -42,8 +43,13 @@ namespace NBF { _renderImage = new ModelRenderImage(ModelHolder.asGraph); } - - var model = _renderImage.LoadModel("Role/npc"); + + //Assets/Resources/gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423.prefab + //Assets/Resources/gfx/rods/syberia/bolo_10021/bolo_10021_LB400.prefab + //"Role/test" + var prefab = Resources.Load("gfx/hooks/berserk_hooks/clas_20421_20446/clas_20423"); + var model = ((GameObject)Object.Instantiate(prefab)); + _renderImage.SetModel(model); _renderImage.modelRoot.localScale = Vector3.one; var previewableAsset = model.GetComponent(); diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b7ce94d9b..efb2d0206 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -34,7 +34,7 @@ TagManager: - - - - - + - Preview - - -