比较提交
合并到: 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:siyaoH-1.17-vulkan2
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
此合并请求有变更与目标分支冲突。
/engine/Build.bee.cs
/engine/src/shell/platform/unity/android/uiwidgets_panel.h
/engine/src/shell/platform/unity/android/uiwidgets_panel.cc
/com.unity.uiwidgets/Runtime/engine/UIWidgetsPanelWrapper.cs
4 次代码提交
作者 | SHA1 | 备注 | 提交日期 |
---|---|---|---|
siyao | bae103b4 | update | 3 年前 |
siyao | b01c7fc9 | cs ap | 3 年前 |
siyao | 17a5ebbc | vkimage & fbo | 3 年前 |
siyao | 7252caa8 | android 28 & vulkan & opengl | 3 年前 |
共有 7 个文件被更改,包括 579 次插入 和 34 次删除
-
40com.unity.uiwidgets/Runtime/engine/UIWidgetsPanelWrapper.cs
-
27engine/Build.bee.cs
-
9engine/src/shell/platform/unity/android/uiwidgets_panel.h
-
198engine/src/shell/platform/unity/android/uiwidgets_panel.cc
-
315engine/src/shell/platform/unity/android/unity_surface_manager.cc
-
17engine/src/shell/platform/unity/android/unity_surface_manager.h
-
7engine/buildios.sh
7
engine/buildios.sh
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
撰写
预览
正在加载...
取消
保存
Reference in new issue