김다솜

트레이너 & 트레이니 위치 조정, 트레이너 & 트레이니 운동 횟수 변수 추가

...@@ -826,6 +826,84 @@ CanvasRenderer: ...@@ -826,6 +826,84 @@ CanvasRenderer:
826 m_PrefabAsset: {fileID: 0} 826 m_PrefabAsset: {fileID: 0}
827 m_GameObject: {fileID: 395084095} 827 m_GameObject: {fileID: 395084095}
828 m_CullTransparentMesh: 0 828 m_CullTransparentMesh: 0
829 +--- !u!1 &433964837
830 +GameObject:
831 + m_ObjectHideFlags: 0
832 + m_CorrespondingSourceObject: {fileID: 0}
833 + m_PrefabInstance: {fileID: 0}
834 + m_PrefabAsset: {fileID: 0}
835 + serializedVersion: 6
836 + m_Component:
837 + - component: {fileID: 433964838}
838 + - component: {fileID: 433964840}
839 + - component: {fileID: 433964839}
840 + m_Layer: 5
841 + m_Name: Traineer_count
842 + m_TagString: Untagged
843 + m_Icon: {fileID: 0}
844 + m_NavMeshLayer: 0
845 + m_StaticEditorFlags: 0
846 + m_IsActive: 1
847 +--- !u!224 &433964838
848 +RectTransform:
849 + m_ObjectHideFlags: 0
850 + m_CorrespondingSourceObject: {fileID: 0}
851 + m_PrefabInstance: {fileID: 0}
852 + m_PrefabAsset: {fileID: 0}
853 + m_GameObject: {fileID: 433964837}
854 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
855 + m_LocalPosition: {x: 0, y: 0, z: 0}
856 + m_LocalScale: {x: 2, y: 2, z: 2}
857 + m_Children: []
858 + m_Father: {fileID: 1679758666}
859 + m_RootOrder: 24
860 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
861 + m_AnchorMin: {x: 0.5, y: 0.5}
862 + m_AnchorMax: {x: 0.5, y: 0.5}
863 + m_AnchoredPosition: {x: -159, y: 180}
864 + m_SizeDelta: {x: 160, y: 30}
865 + m_Pivot: {x: 0.5, y: 0.5}
866 +--- !u!114 &433964839
867 +MonoBehaviour:
868 + m_ObjectHideFlags: 0
869 + m_CorrespondingSourceObject: {fileID: 0}
870 + m_PrefabInstance: {fileID: 0}
871 + m_PrefabAsset: {fileID: 0}
872 + m_GameObject: {fileID: 433964837}
873 + m_Enabled: 1
874 + m_EditorHideFlags: 0
875 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
876 + m_Name:
877 + m_EditorClassIdentifier:
878 + m_Material: {fileID: 0}
879 + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
880 + m_RaycastTarget: 1
881 + m_Maskable: 1
882 + m_OnCullStateChanged:
883 + m_PersistentCalls:
884 + m_Calls: []
885 + m_FontData:
886 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
887 + m_FontSize: 25
888 + m_FontStyle: 0
889 + m_BestFit: 0
890 + m_MinSize: 0
891 + m_MaxSize: 40
892 + m_Alignment: 0
893 + m_AlignByGeometry: 0
894 + m_RichText: 1
895 + m_HorizontalOverflow: 0
896 + m_VerticalOverflow: 0
897 + m_LineSpacing: 1
898 + m_Text: 0/20
899 +--- !u!222 &433964840
900 +CanvasRenderer:
901 + m_ObjectHideFlags: 0
902 + m_CorrespondingSourceObject: {fileID: 0}
903 + m_PrefabInstance: {fileID: 0}
904 + m_PrefabAsset: {fileID: 0}
905 + m_GameObject: {fileID: 433964837}
906 + m_CullTransparentMesh: 0
829 --- !u!1 &469119554 907 --- !u!1 &469119554
830 GameObject: 908 GameObject:
831 m_ObjectHideFlags: 0 909 m_ObjectHideFlags: 0
...@@ -2352,6 +2430,7 @@ RectTransform: ...@@ -2352,6 +2430,7 @@ RectTransform:
2352 - {fileID: 1373649303} 2430 - {fileID: 1373649303}
2353 - {fileID: 972410872} 2431 - {fileID: 972410872}
2354 - {fileID: 938472433} 2432 - {fileID: 938472433}
2433 + - {fileID: 433964838}
2355 m_Father: {fileID: 0} 2434 m_Father: {fileID: 0}
2356 m_RootOrder: 4 2435 m_RootOrder: 4
2357 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 2436 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
...@@ -261,7 +261,8 @@ class CharacterSkeleton ...@@ -261,7 +261,8 @@ class CharacterSkeleton
261 if (move == true) 261 if (move == true)
262 { 262 {
263 Vector3 m = joint[JointType_SpineBase]; 263 Vector3 m = joint[JointType_SpineBase];
264 - if (mirrored) m = new Vector3(-m.x, m.y, -m.z); 264 + if (mirrored) m = new Vector3((float)0.9, m.y, 0);
265 + //if (mirrored) m = new Vector3(-m.x, m.y, -m.z);
265 humanoid.transform.position = m; 266 humanoid.transform.position = m;
266 } 267 }
267 } 268 }
...@@ -333,8 +334,8 @@ class CharacterSkeleton ...@@ -333,8 +334,8 @@ class CharacterSkeleton
333 if (move == true) 334 if (move == true)
334 { 335 {
335 Vector3 m = joint[JointType_SpineBase]; 336 Vector3 m = joint[JointType_SpineBase];
336 - 337 + Debug.Log("m : "+m);
337 - if (mirrored) m = new Vector3(-1, m.y, 1); 338 + if (mirrored) m = new Vector3((float)-0.9,(float)(m.y + 0.3), (float)0.4);
338 humanoid.transform.position = m; 339 humanoid.transform.position = m;
339 } 340 }
340 } 341 }
......