浏览代码

Merge branch 'master' into feature/generic-animation-rigs

# Conflicts:
#	CHANGELOG.md
/feature-generic-animation-rigs
Thomas ICHÉ 3 年前
当前提交
28d1e0ad
共有 231 个文件被更改,包括 1195 次插入437 次删除
  1. 5
      CHANGELOG.md
  2. 2
      Editor/CheckWindow/CheckWindow.cs
  3. 5
      Editor/CustomInspectors/ActionBaseEditor.cs
  4. 2
      Editor/CustomInspectors/EventBaseEditor.cs
  5. 16
      Editor/CustomInspectors/IngredientEditor.cs
  6. 4
      Editor/CustomInspectors/LogicBaseEditor.cs
  7. 2
      Editor/CustomInspectors/ManagerEditor.cs
  8. 4
      Editor/CustomInspectors/RigEditor.cs
  9. 1
      Editor/GameViewLink/LinkGameView.cs
  10. 2
      Editor/IngredientsExplorer/IngredientsExplorerWindow.cs
  11. 6
      Icons/Actions/ic-action-attach.png
  12. 34
      Icons/Actions/ic-action-attach.png.meta
  13. 7
      Icons/Actions/ic-action-audio.png
  14. 34
      Icons/Actions/ic-action-audio.png.meta
  15. 5
      Icons/Actions/ic-action-director.png
  16. 27
      Icons/Actions/ic-action-director.png.meta
  17. 5
      Icons/Actions/ic-action-event.png
  18. 34
      Icons/Actions/ic-action-event.png.meta
  19. 6
      Icons/Actions/ic-action-exit.png
  20. 34
      Icons/Actions/ic-action-exit.png.meta
  21. 5
      Icons/Actions/ic-action-generic.png
  22. 34
      Icons/Actions/ic-action-generic.png.meta
  23. 6
      Icons/Actions/ic-action-list.png
  24. 34
      Icons/Actions/ic-action-list.png.meta
  25. 10
      Icons/Actions/ic-action-log.png
  26. 27
      Icons/Actions/ic-action-log.png.meta
  27. 9
      Icons/Actions/ic-action-message.png
  28. 34
      Icons/Actions/ic-action-message.png.meta
  29. 4
      Icons/Actions/ic-action-mouse.png
  30. 34
      Icons/Actions/ic-action-mouse.png.meta
  31. 7
      Icons/Actions/ic-action-randomseed.png
  32. 14
      Icons/Actions/ic-action-randomseed.png.meta
  33. 7
      Icons/Actions/ic-action-rigidbody.png
  34. 21
      Icons/Actions/ic-action-rigidbody.png.meta
  35. 4
      Icons/Actions/ic-action-save.png
  36. 34
      Icons/Actions/ic-action-save.png.meta
  37. 5
      Icons/Actions/ic-action-screen.png
  38. 34
      Icons/Actions/ic-action-screen.png.meta
  39. 3
      Icons/Actions/ic-action-spawn.png
  40. 34
      Icons/Actions/ic-action-spawn.png.meta
  41. 4
      Icons/Actions/ic-action-teleport.png
  42. 34
      Icons/Actions/ic-action-teleport.png.meta
  43. 11
      Icons/Actions/ic-action-time.png
  44. 34
      Icons/Actions/ic-action-time.png.meta
  45. 2
      Icons/Actions/ic-action-timeline.png
  46. 34
      Icons/Actions/ic-action-timeline.png.meta
  47. 7
      Icons/Actions/ic-action-trash.png
  48. 34
      Icons/Actions/ic-action-trash.png.meta
  49. 9
      Icons/Actions/ic-action-ui.png
  50. 27
      Icons/Actions/ic-action-ui.png.meta
  51. 9
      Icons/Actions/ic-generic-action.png
  52. 34
      Icons/Actions/ic-generic-action.png.meta
  53. 50
      Icons/Discover/Discover Icon.png.meta
  54. 50
      Icons/Discover/DiscoverAsset Icon.png.meta
  55. 6
      Icons/Events/ic-event-awake.png
  56. 34
      Icons/Events/ic-event-awake.png.meta
  57. 24
      Icons/Events/ic-event-destroy.png
  58. 34
      Icons/Events/ic-event-destroy.png.meta
  59. 6
      Icons/Events/ic-event-enable-disable.png
  60. 34
      Icons/Events/ic-event-enable-disable.png.meta
  61. 5
      Icons/Events/ic-event-generic.png
  62. 21
      Icons/Events/ic-event-generic.png.meta
  63. 6
      Icons/Events/ic-event-keyboard.png
  64. 34
      Icons/Events/ic-event-keyboard.png.meta
  65. 11
      Icons/Events/ic-event-message.png
  66. 34
      Icons/Events/ic-event-message.png.meta
  67. 4
      Icons/Events/ic-event-start.png
  68. 34
      Icons/Events/ic-event-start.png.meta
  69. 8
      Icons/Events/ic-event-trigger.png
  70. 34
      Icons/Events/ic-event-trigger.png.meta
  71. 6
      Icons/Logic/ic-generic-logic.png
  72. 7
      Icons/Misc/ic-counter.png
  73. 5
      Icons/Misc/ic-crate.png
  74. 4
      Icons/Misc/ic-factory.png
  75. 2
      Icons/Misc/ic-first-person-controller.png
  76. 3
      Icons/Misc/ic-gamepad-input.png
  77. 3
      Icons/Misc/ic-globals.png
  78. 3
      Icons/Misc/ic-interactive-user.png
  79. 6
      Icons/Misc/ic-interactive.png
  80. 7
      Icons/Misc/ic-pickup-effect.png
  81. 7
      Icons/Misc/ic-pickup.png
  82. 6
      Icons/Misc/ic-scene.png
  83. 8
      Icons/Misc/ic-timer.png
  84. 47
      Icons/Misc/ic-timer.png.meta
  85. 9
      Icons/Misc/ic-toolbox.png
  86. 4
      Icons/Rigs/ic-rig-director-control.png
  87. 34
      Icons/Rigs/ic-rig-director-control.png.meta
  88. 8
      Icons/Rigs/ic-rig-float.png
  89. 34
      Icons/Rigs/ic-rig-float.png.meta
  90. 8
      Icons/Rigs/ic-rig-follow-path.png
  91. 34
      Icons/Rigs/ic-rig-follow-path.png.meta
  92. 6
      Icons/Rigs/ic-rig-lookat.png
  93. 34
      Icons/Rigs/ic-rig-lookat.png.meta
  94. 7
      Icons/Rigs/ic-rig-reachposition.png
  95. 34
      Icons/Rigs/ic-rig-reachposition.png.meta
  96. 3
      Icons/Rigs/ic-rig-rotate.png
  97. 34
      Icons/Rigs/ic-rig-rotate.png.meta
  98. 2
      Runtime/Ingredients/Counter/CounterAction.cs.meta
  99. 2
      Runtime/Ingredients/Counter/CounterLogic.cs.meta
  100. 2
      Runtime/Ingredients/Factory/FactorySetTargetAction.cs.meta

5
CHANGELOG.md


#### Added
* **Unity 2021.2**: Changed the **SceneViewToolbar** to use the new Overlays. Requires 2021.2.0a18 or newer, older versions still use the classic toolbar
#### Fixed
* Revised Iconography, Breadcrumb UI
## 2020.2.8

2
Editor/CheckWindow/CheckWindow.cs


public class CheckWindow : EditorWindow
{
[MenuItem("Window/Gameplay Ingredients/Check and Resolve", priority = MenuItems.kWindowMenuPriority+30)]
static void OpenWindow()
public static void OpenWindow()
{
GetWindow<CheckWindow>(false);
}

5
Editor/CustomInspectors/ActionBaseEditor.cs


DrawBreadCrumb("Action", color, () =>
{
NaughtyEditorGUI.PropertyField_Layout(m_Name, true);
using (new GUILayout.VerticalScope(GUILayout.ExpandWidth(true)))
NaughtyEditorGUI.PropertyField_Layout(m_Name, true);
OpenIngredientsExplorerButton(serializedObject.targetObject as ActionBase);
});

}
}
static readonly Color color = new Color(1f, .1f, .5f, 1f);
static readonly Color color = new Color(.8f, .25f, .35f, 1f);
}
}

2
Editor/CustomInspectors/EventBaseEditor.cs


}
}
static readonly Color