比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/tag-release_1.5.4
unity-tech-cn:/kgdev
unity-tech-cn:/siyaoH-1.17-PlatformMessage
unity-tech-cn:/dev_k12
unity-tech-cn:/uiwidgets_1.0
unity-tech-cn:/work_around_tal
unity-tech-cn:/zgh-devtools
unity-tech-cn:/zxw-devTools
unity-tech-cn:/siyaoH-1.17-vulkan
unity-tech-cn:/siyaoH-1.17-vulkan2
unity-tech-cn:/zgh-build_scripts
unity-tech-cn:/siyaoH-1.17-android
unity-tech-cn:/siyaoH-1.17-externalTexture
unity-tech-cn:/siyaoH-1.17-debugDraw
unity-tech-cn:/2.0.3
unity-tech-cn:/siyaoH-1.17-rawTouches
unity-tech-cn:/prepare_2.0.6
unity-tech-cn:/fix_shortcuts
unity-tech-cn:/fix_alignment_issue
unity-tech-cn:/wangshuang
unity-tech-cn:/siyaoH-paste
unity-tech-cn:/zxw-fix_build_script
unity-tech-cn:/siyaoH-1.17-fixLottie
unity-tech-cn:/zxw-support_editor_dragdrop
unity-tech-cn:/siyaoH-1.17-fixAndroid
unity-tech-cn:/siyaoH-1.17-HandleEvent
unity-tech-cn:/siyaoH-1.17-combineTouch
unity-tech-cn:/refine_readme
unity-tech-cn:/2.0.4
unity-tech-cn:/2.0.1
unity-tech-cn:/dev-packman
unity-tech-cn:/zxw-fix_text_shadow_issue
unity-tech-cn:/zxw-fix_backdropfilter
unity-tech-cn:/zxw-fix_transform_hover_issue
unity-tech-cn:/zxw-refine_codegen
unity-tech-cn:/zxw-fix_material_datepicker_issue
unity-tech-cn:/zxw-fix_material_text_direction
unity-tech-cn:/zxw-fix_path_metric_crash
unity-tech-cn:/demo
unity-tech-cn:/jiacheng-demo_proctice
unity-tech-cn:/zxw-3d
unity-tech-cn:/zxw-fix_crash
unity-tech-cn:/zxw-fix_input_issue
unity-tech-cn:/zxw-3d_android
unity-tech-cn:/main/LAO
拉取从: unity-tech-cn:dev_k12
unity-tech-cn:/main
unity-tech-cn:/tag-release_1.5.4
unity-tech-cn:/kgdev
unity-tech-cn:/siyaoH-1.17-PlatformMessage
unity-tech-cn:/dev_k12
unity-tech-cn:/uiwidgets_1.0
unity-tech-cn:/work_around_tal
unity-tech-cn:/zgh-devtools
unity-tech-cn:/zxw-devTools
unity-tech-cn:/siyaoH-1.17-vulkan
unity-tech-cn:/siyaoH-1.17-vulkan2
unity-tech-cn:/zgh-build_scripts
unity-tech-cn:/siyaoH-1.17-android
unity-tech-cn:/siyaoH-1.17-externalTexture
unity-tech-cn:/siyaoH-1.17-debugDraw
unity-tech-cn:/2.0.3
unity-tech-cn:/siyaoH-1.17-rawTouches
unity-tech-cn:/prepare_2.0.6
unity-tech-cn:/fix_shortcuts
unity-tech-cn:/fix_alignment_issue
unity-tech-cn:/wangshuang
unity-tech-cn:/siyaoH-paste
unity-tech-cn:/zxw-fix_build_script
unity-tech-cn:/siyaoH-1.17-fixLottie
unity-tech-cn:/zxw-support_editor_dragdrop
unity-tech-cn:/siyaoH-1.17-fixAndroid
unity-tech-cn:/siyaoH-1.17-HandleEvent
unity-tech-cn:/siyaoH-1.17-combineTouch
unity-tech-cn:/refine_readme
unity-tech-cn:/2.0.4
unity-tech-cn:/2.0.1
unity-tech-cn:/dev-packman
unity-tech-cn:/zxw-fix_text_shadow_issue
unity-tech-cn:/zxw-fix_backdropfilter
unity-tech-cn:/zxw-fix_transform_hover_issue
unity-tech-cn:/zxw-refine_codegen
unity-tech-cn:/zxw-fix_material_datepicker_issue
unity-tech-cn:/zxw-fix_material_text_direction
unity-tech-cn:/zxw-fix_path_metric_crash
unity-tech-cn:/demo
unity-tech-cn:/jiacheng-demo_proctice
unity-tech-cn:/zxw-3d
unity-tech-cn:/zxw-fix_crash
unity-tech-cn:/zxw-fix_input_issue
unity-tech-cn:/zxw-3d_android
unity-tech-cn:/main/LAO
此合并请求有变更与目标分支冲突。
/com.unity.uiwidgets/Runtime/redux/widget_redux.cs
/com.unity.uiwidgets/Runtime/rendering/binding.cs
/com.unity.uiwidgets/Runtime/widgets/binding.cs
/com.unity.uiwidgets/Runtime/gestures/converter.cs
/com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
/com.unity.uiwidgets/Runtime/editor/editor_mouse_tracking.cs
/com.unity.uiwidgets/Runtime/editor/editor_window.cs
/com.unity.uiwidgets/Runtime/gestures/mouse_tracking.cs
8 次代码提交
作者 | SHA1 | 备注 | 提交日期 |
---|---|---|---|
xingwei.zhu | 3bcde7c0 | add icon constraints to input_decorator | 4 年前 |
xingweizhu | 46f8a642 | fix mouse tracking issue | 3 年前 |
GitHub | 7a17ac87 |
Merge pull request #32 from Unity-Technologies/zxw/dev_k12
add a uiwidgetPanel host to StoreConnector, so that we can binding it… |
4 年前 |
xingwei.zhu | 70ecfd32 | add a uiwidgetPanel host to StoreConnector, so that we can binding it to the right window.instance when stateChanged callback is triggered | 4 年前 |
siyao | 2a1b613f | fix | 4 年前 |
xingweizhu | 0d71f9f6 | try fix crash when exiting editor with uiwidgets-based editor window openned | 4 年前 |
xingwei.zhu | 2fa8b1a3 | add support for better drag&drop functionality in Editor | 4 年前 |
xingwei.zhu | dc7e6275 | port forceUpdate to EditorWindow | 4 年前 |
共有 7 个文件被更改,包括 86 次插入 和 11 次删除
-
21com.unity.uiwidgets/Runtime/redux/widget_redux.cs
-
12com.unity.uiwidgets/Runtime/editor/editor_window.cs
-
20com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
-
4com.unity.uiwidgets/Runtime/gestures/converter.cs
-
4com.unity.uiwidgets/Runtime/rendering/binding.cs
-
6com.unity.uiwidgets/Runtime/widgets/binding.cs
-
30com.unity.uiwidgets/Runtime/material/input_decorator.cs
撰写
预览
正在加载...
取消
保存
Reference in new issue