修改长短手套显示
This commit is contained in:
parent
512f33aeb4
commit
e11b64aeb6
Binary file not shown.
@ -3880,7 +3880,7 @@
|
|||||||
"ThreeTaskName": "人员准备",
|
"ThreeTaskName": "人员准备",
|
||||||
"TaskType": "动画",
|
"TaskType": "动画",
|
||||||
"ToolsName": "",
|
"ToolsName": "",
|
||||||
"ModelBT": "ShortHand",
|
"ModelBT": "LongHand",
|
||||||
"Operation": "在衣帽间,点击无菌手套,手套被捏在角色手中",
|
"Operation": "在衣帽间,点击无菌手套,手套被捏在角色手中",
|
||||||
"ProcessDescription": "穿戴工作服与无菌手套",
|
"ProcessDescription": "穿戴工作服与无菌手套",
|
||||||
"SoundPath": "",
|
"SoundPath": "",
|
||||||
|
|||||||
@ -33065,6 +33065,8 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_isShort: 0
|
_isShort: 0
|
||||||
|
_shortHands: {fileID: 1656041747}
|
||||||
|
_LongHands: {fileID: 880068896}
|
||||||
--- !u!4 &1344588678 stripped
|
--- !u!4 &1344588678 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 7444832472504870127, guid: 75d184e5e77f85248908f8b7da22fc30,
|
m_CorrespondingSourceObject: {fileID: 7444832472504870127, guid: 75d184e5e77f85248908f8b7da22fc30,
|
||||||
@ -47891,6 +47893,8 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_isShort: 1
|
_isShort: 1
|
||||||
|
_shortHands: {fileID: 1656041747}
|
||||||
|
_LongHands: {fileID: 880068896}
|
||||||
--- !u!1 &2097419794
|
--- !u!1 &2097419794
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -23,10 +23,12 @@ namespace ZXK.LouDiXvMuNiu
|
|||||||
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ))
|
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ))
|
||||||
{
|
{
|
||||||
transform.parent.Find("ShortHand").gameObject.SetActive(_isShort);
|
transform.parent.Find("ShortHand").gameObject.SetActive(_isShort);
|
||||||
|
transform.parent.Find("LongHand").gameObject.SetActive(!_isShort);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
transform.parent.Find("ShortHand").gameObject.SetActive(!_isShort);
|
transform.parent.Find("ShortHand").gameObject.SetActive(!_isShort);
|
||||||
|
transform.parent.Find("LongHand").gameObject.SetActive(_isShort);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -36,10 +38,12 @@ namespace ZXK.LouDiXvMuNiu
|
|||||||
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP)
|
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP)
|
||||||
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD))
|
|| GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD))
|
||||||
{
|
{
|
||||||
|
transform.parent.Find("ShortHand").gameObject.SetActive(_isShort);
|
||||||
transform.parent.Find("LongHand").gameObject.SetActive(!_isShort);
|
transform.parent.Find("LongHand").gameObject.SetActive(!_isShort);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
transform.parent.Find("ShortHand").gameObject.SetActive(!_isShort);
|
||||||
transform.parent.Find("LongHand").gameObject.SetActive(_isShort);
|
transform.parent.Find("LongHand").gameObject.SetActive(_isShort);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,10 +30,10 @@ EditorUserSettings:
|
|||||||
value: 010300565d060f0c0f0d5c76477a0d444715192f7f7d7731747b4837b3b4353b
|
value: 010300565d060f0c0f0d5c76477a0d444715192f7f7d7731747b4837b3b4353b
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-8:
|
RecentlyUsedSceneGuid-8:
|
||||||
value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d
|
value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-9:
|
RecentlyUsedSceneGuid-9:
|
||||||
value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a
|
value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d
|
||||||
flags: 0
|
flags: 0
|
||||||
UnityEditor.ShaderGraph.Blackboard:
|
UnityEditor.ShaderGraph.Blackboard:
|
||||||
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf
|
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf
|
||||||
|
|||||||
@ -26,7 +26,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 400, y: 100}
|
m_MinSize: {x: 400, y: 100}
|
||||||
m_MaxSize: {x: 32384, y: 16192}
|
m_MaxSize: {x: 32384, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 26
|
controlID: 2253
|
||||||
--- !u!114 &2
|
--- !u!114 &2
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -150,7 +150,7 @@ MonoBehaviour:
|
|||||||
m_MinSize: {x: 100, y: 100}
|
m_MinSize: {x: 100, y: 100}
|
||||||
m_MaxSize: {x: 8096, y: 16192}
|
m_MaxSize: {x: 8096, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 27
|
controlID: 2254
|
||||||
--- !u!114 &4
|
--- !u!114 &4
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@ -639,9 +639,9 @@ MonoBehaviour:
|
|||||||
m_PlayAudio: 0
|
m_PlayAudio: 0
|
||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
m_Target: {x: -0.012517691, y: -1.6328022, z: 38.330254}
|
m_Target: {x: 10.713952, y: -2.6334312, z: 39.483498}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -0.012517691, y: -1.6328022, z: 38.330254}
|
m_Value: {x: 10.713952, y: -2.6334312, z: 39.483498}
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
@ -687,17 +687,17 @@ MonoBehaviour:
|
|||||||
m_GridAxis: 1
|
m_GridAxis: 1
|
||||||
m_gridOpacity: 0.5
|
m_gridOpacity: 0.5
|
||||||
m_Rotation:
|
m_Rotation:
|
||||||
m_Target: {x: 0.10159132, y: 0.89816415, z: -0.29117656, w: 0.3133686}
|
m_Target: {x: 0.19846682, y: 0.43412718, z: -0.09867598, w: 0.8731594}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 0.10159115, y: 0.89816266, z: -0.29117608, w: 0.31336805}
|
m_Value: {x: 0.19846685, y: 0.43412724, z: -0.098675996, w: 0.8731595}
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 1.3127252
|
m_Target: 0.13001278
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 1.3127252
|
m_Value: 0.13001278
|
||||||
m_Ortho:
|
m_Ortho:
|
||||||
m_Target: 0
|
m_Target: 1
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 0
|
m_Value: 1
|
||||||
m_CameraSettings:
|
m_CameraSettings:
|
||||||
m_Speed: 1
|
m_Speed: 1
|
||||||
m_SpeedNormalized: 0.5
|
m_SpeedNormalized: 0.5
|
||||||
@ -879,7 +879,7 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 810
|
x: 810
|
||||||
y: 0
|
y: 0
|
||||||
width: 455
|
width: 380
|
||||||
height: 939
|
height: 939
|
||||||
m_MinSize: {x: 202, y: 221}
|
m_MinSize: {x: 202, y: 221}
|
||||||
m_MaxSize: {x: 4002, y: 4021}
|
m_MaxSize: {x: 4002, y: 4021}
|
||||||
@ -911,7 +911,7 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 810
|
x: 810
|
||||||
y: 73
|
y: 73
|
||||||
width: 453
|
width: 378
|
||||||
height: 918
|
height: 918
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
@ -926,9 +926,9 @@ MonoBehaviour:
|
|||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: e07b0000
|
m_SelectedIDs: e27b0000
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: 800effffe6f6ffff8cf7ffffe8f7ffffecf7ffff2efbffff74900000
|
m_ExpandedIDs: d2e8f7ffaa3bf8ffb840f8ffdaa1f8ff5408f9ff3c73f9ffc4d2f9ffdca2fafff606fbfffa7cfbffa6bffbffaabffbffbac0fbff6ad9fbffd0defbff5841fcffb441fcffb844fcffb845fcffa2b0fcff1a27fdff7627fdff284efdff14b9fdff1099feff6c99feffb09ffeffc2a2feff800effffe6f6ffff8cf7ffffe8f7ffffecf7ffff2efbfffff4ffffff749000007c4001006c470100244901005291010042980100fa99010064e901001ceb01007417020094170200801f020038210200d0220200e8550200a057020004a80200bca902003cab020024f90200dcfa020016ff0200da13030092150300121703004c2f030004310300
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@ -967,9 +967,9 @@ MonoBehaviour:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1265
|
x: 1190
|
||||||
y: 0
|
y: 0
|
||||||
width: 361
|
width: 436
|
||||||
height: 939
|
height: 939
|
||||||
m_MinSize: {x: 232, y: 271}
|
m_MinSize: {x: 232, y: 271}
|
||||||
m_MaxSize: {x: 10002, y: 10021}
|
m_MaxSize: {x: 10002, y: 10021}
|
||||||
@ -999,9 +999,9 @@ MonoBehaviour:
|
|||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1265
|
x: 1190
|
||||||
y: 73
|
y: 73
|
||||||
width: 359
|
width: 434
|
||||||
height: 918
|
height: 918
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
@ -1024,7 +1024,7 @@ MonoBehaviour:
|
|||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
- Assets/_Scenes
|
- Assets/_Scenes/TrainExam
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_OriginalText:
|
m_OriginalText:
|
||||||
m_ImportLogFlags: 0
|
m_ImportLogFlags: 0
|
||||||
@ -1041,7 +1041,7 @@ MonoBehaviour:
|
|||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: 5e780000
|
m_SelectedIDs: 5e780000
|
||||||
m_LastClickedID: 30814
|
m_LastClickedID: 30814
|
||||||
m_ExpandedIDs: 000000009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da780000dc780000de780000e0780000e2780000e4780000e6780000
|
m_ExpandedIDs: ffffffff000000009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da780000dc780000e0780000e2780000e4780000e6780000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@ -1067,9 +1067,9 @@ MonoBehaviour:
|
|||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_AssetTreeState:
|
m_AssetTreeState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: e07b0000
|
m_SelectedIDs: e27b0000
|
||||||
m_LastClickedID: 31712
|
m_LastClickedID: 31714
|
||||||
m_ExpandedIDs: ffffffff000000009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da780000dc780000e0780000e2780000e4780000e6780000
|
m_ExpandedIDs: ffffffff000000009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da780000dc780000e0780000e2780000e4780000e6780000e67b00000c7c0000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@ -1094,8 +1094,8 @@ MonoBehaviour:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_ListAreaState:
|
m_ListAreaState:
|
||||||
m_SelectedInstanceIDs: e07b0000
|
m_SelectedInstanceIDs: e27b0000
|
||||||
m_LastClickedInstanceID: 31712
|
m_LastClickedInstanceID: 31714
|
||||||
m_HadKeyboardFocusLastEvent: 0
|
m_HadKeyboardFocusLastEvent: 0
|
||||||
m_ExpandedInstanceIDs:
|
m_ExpandedInstanceIDs:
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
@ -1144,8 +1144,8 @@ MonoBehaviour:
|
|||||||
y: 0
|
y: 0
|
||||||
width: 294
|
width: 294
|
||||||
height: 939
|
height: 939
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 276, y: 71}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 4021}
|
||||||
m_ActualView: {fileID: 14}
|
m_ActualView: {fileID: 14}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 14}
|
- {fileID: 14}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user