比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/BodyRecording
unity-tech-cn:/ARCoreShaderFog
unity-tech-cn:/Shaders2019
unity-tech-cn:/ShaderShadow
unity-tech-cn:/XRI_UX_Framework
unity-tech-cn:/Shaders
unity-tech-cn:/main/marcusl
拉取从: unity-tech-cn:XRI_UX_Framework
unity-tech-cn:/main
unity-tech-cn:/BodyRecording
unity-tech-cn:/ARCoreShaderFog
unity-tech-cn:/Shaders2019
unity-tech-cn:/ShaderShadow
unity-tech-cn:/XRI_UX_Framework
unity-tech-cn:/Shaders
unity-tech-cn:/main/marcusl
此合并请求有变更与目标分支冲突。
/Packages/manifest.json
/Packages/packages-lock.json
/ProjectSettings/ProjectSettings.asset
1 次代码提交
main
...
XRI_UX_Framework
| 作者 | SHA1 | 备注 | 提交日期 |
|---|---|---|---|
DanMillerDev
|
57a06db3 | updated UXManager scene to use the XRI framework for manipulating objects after placing them | 4 年前 |
共有 19 个文件被更改，包括 1039 次插入 和 69 次删除
-
439Assets/Common/Prefabs/SphereObject.prefab
-
166Assets/UX/Scenes/UXManagerScene.unity
-
1Packages/manifest.json
-
20Packages/packages-lock.json
-
16ProjectSettings/ProjectSettings.asset
-
109Assets/Common/Materials/PlacedSphereHeadMat.mat
-
8Assets/Common/Materials/PlacedSphereHeadMat.mat.meta
-
109Assets/Common/Materials/PlacedSphereSelectionMat.mat
-
8Assets/Common/Materials/PlacedSphereSelectionMat.mat.meta
-
8Assets/Plugins.meta
-
8Assets/Plugins/Android.meta
-
52Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED
-
7Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta
-
84Assets/Plugins/Android/launcherTemplate.gradle
-
7Assets/Plugins/Android/launcherTemplate.gradle.meta
-
59Assets/Plugins/Android/mainTemplate.gradle
-
7Assets/Plugins/Android/mainTemplate.gradle.meta
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &-4490881977315335027 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 11 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} |
|||
m_Name: |
|||
m_EditorClassIdentifier: |
|||
version: 1 |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: PlacedSphereHeadMat |
|||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} |
|||
m_ShaderKeywords: |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BaseMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _SpecGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _AlphaClip: 0 |
|||
- _Blend: 0 |
|||
- _BumpScale: 1 |
|||
- _Cull: 2 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _EnvironmentReflections: 1 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: 0 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0 |
|||
- _Mode: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _QueueOffset: 0 |
|||
- _ReceiveShadows: 1 |
|||
- _Smoothness: 0 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _Surface: 0 |
|||
- _UVSec: 0 |
|||
- _WorkflowMode: 1 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _BaseColor: {r: 0, g: 0.74509805, b: 0.8196079, a: 1} |
|||
- _Color: {r: 0.1999999, g: 1, b: 0, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 71d98a47f9904344c92c30b943770b3d |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &-4490881977315335027 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 11 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} |
|||
m_Name: |
|||
m_EditorClassIdentifier: |
|||
version: 1 |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: PlacedSphereSelectionMat |
|||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} |
|||
m_ShaderKeywords: |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BaseMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _SpecGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _AlphaClip: 0 |
|||
- _Blend: 0 |
|||
- _BumpScale: 1 |
|||
- _Cull: 2 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _EnvironmentReflections: 1 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: 0 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0 |
|||
- _Mode: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _QueueOffset: 0 |
|||
- _ReceiveShadows: 1 |
|||
- _Smoothness: 0 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _Surface: 0 |
|||
- _UVSec: 0 |
|||
- _WorkflowMode: 1 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _BaseColor: {r: 0, g: 0.74509805, b: 0.8196079, a: 1} |
|||
- _Color: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 928b7589243a71e4cb5911b1b23640e8 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 128bfc2997f5d2c46909a5ae206fb406 |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: d643dcc8d9fdb104eac267a0c624c7e7 |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
buildscript { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
} |
|||
dependencies { |
|||
// Must be Android Gradle Plugin 3.6.0 or later. For a list of |
|||
// compatible Gradle versions refer to: |
|||
// https://developer.android.com/studio/releases/gradle-plugin |
|||
classpath 'com.android.tools.build:gradle:3.6.0' |
|||
} |
|||
} |
|||
|
|||
allprojects { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
flatDir { |
|||
dirs 'libs' |
|||
} |
|||
} |
|||
} |
|||
|
|||
allprojects { |
|||
buildscript { |
|||
repositories {**ARTIFACTORYREPOSITORY** |
|||
google() |
|||
jcenter() |
|||
} |
|||
|
|||
dependencies { |
|||
// If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity |
|||
// See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html |
|||
// See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle |
|||
// To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version |
|||
classpath 'com.android.tools.build:gradle:3.4.0' |
|||
**BUILD_SCRIPT_DEPS** |
|||
} |
|||
} |
|||
|
|||
repositories {**ARTIFACTORYREPOSITORY** |
|||
google() |
|||
jcenter() |
|||
flatDir { |
|||
dirs "${project(':unityLibrary').projectDir}/libs" |
|||
} |
|||
} |
|||
} |
|||
|
|||
task clean(type: Delete) { |
|||
delete rootProject.buildDir |
|||
} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: ef7b2eb52a9cb9042b49a52bcc899c05 |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
buildscript { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
} |
|||
dependencies { |
|||
// Must be Android Gradle Plugin 3.6.0 or later. For a list of |
|||
// compatible Gradle versions refer to: |
|||
// https://developer.android.com/studio/releases/gradle-plugin |
|||
classpath 'com.android.tools.build:gradle:3.6.0' |
|||
} |
|||
} |
|||
|
|||
allprojects { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
flatDir { |
|||
dirs 'libs' |
|||
} |
|||
} |
|||
} |
|||
|
|||
apply plugin: 'com.android.application' |
|||
|
|||
dependencies { |
|||
implementation project(':unityLibrary') |
|||
} |
|||
|
|||
android { |
|||
compileSdkVersion **APIVERSION** |
|||
buildToolsVersion '**BUILDTOOLS**' |
|||
|
|||
compileOptions { |
|||
sourceCompatibility JavaVersion.VERSION_1_8 |
|||
targetCompatibility JavaVersion.VERSION_1_8 |
|||
} |
|||
|
|||
defaultConfig { |
|||
minSdkVersion **MINSDKVERSION** |
|||
targetSdkVersion **TARGETSDKVERSION** |
|||
applicationId '**APPLICATIONID**' |
|||
ndk { |
|||
abiFilters **ABIFILTERS** |
|||
} |
|||
versionCode **VERSIONCODE** |
|||
versionName '**VERSIONNAME**' |
|||
} |
|||
|
|||
aaptOptions { |
|||
noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**] |
|||
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" |
|||
}**SIGN** |
|||
|
|||
lintOptions { |
|||
abortOnError false |
|||
} |
|||
|
|||
buildTypes { |
|||
debug { |
|||
minifyEnabled **MINIFY_DEBUG** |
|||
useProguard **PROGUARD_DEBUG** |
|||
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** |
|||
jniDebuggable true |
|||
} |
|||
release { |
|||
minifyEnabled **MINIFY_RELEASE** |
|||
useProguard **PROGUARD_RELEASE** |
|||
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** |
|||
} |
|||
}**PACKAGING_OPTIONS****SPLITS** |
|||
**BUILT_APK_LOCATION** |
|||
bundle { |
|||
language { |
|||
enableSplit = false |
|||
} |
|||
density { |
|||
enableSplit = false |
|||
} |
|||
abi { |
|||
enableSplit = true |
|||
} |
|||
} |
|||
}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP** |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: ecd4fa49d2eb51f4182bee5fca781068 |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
buildscript { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
} |
|||
dependencies { |
|||
// Must be Android Gradle Plugin 3.6.0 or later. For a list of |
|||
// compatible Gradle versions refer to: |
|||
// https://developer.android.com/studio/releases/gradle-plugin |
|||
classpath 'com.android.tools.build:gradle:3.6.0' |
|||
} |
|||
} |
|||
|
|||
allprojects { |
|||
repositories { |
|||
google() |
|||
jcenter() |
|||
flatDir { |
|||
dirs 'libs' |
|||
} |
|||
} |
|||
} |
|||
|
|||
apply plugin: 'com.android.library' |
|||
**APPLY_PLUGINS** |
|||
|
|||
dependencies { |
|||
implementation fileTree(dir: 'libs', include: ['*.jar']) |
|||
**DEPS**} |
|||
|
|||
android { |
|||
compileSdkVersion **APIVERSION** |
|||
buildToolsVersion '**BUILDTOOLS**' |
|||
|
|||
compileOptions { |
|||
sourceCompatibility JavaVersion.VERSION_1_8 |
|||
targetCompatibility JavaVersion.VERSION_1_8 |
|||
} |
|||
|
|||
defaultConfig { |
|||
minSdkVersion **MINSDKVERSION** |
|||
targetSdkVersion **TARGETSDKVERSION** |
|||
ndk { |
|||
abiFilters **ABIFILTERS** |
|||
} |
|||
versionCode **VERSIONCODE** |
|||
versionName '**VERSIONNAME**' |
|||
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** |
|||
} |
|||
|
|||
lintOptions { |
|||
abortOnError false |
|||
} |
|||
|
|||
aaptOptions { |
|||
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" |
|||
}**PACKAGING_OPTIONS** |
|||
}**REPOSITORIES****SOURCE_BUILD_SETUP** |
|||
**EXTERNAL_SOURCES** |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 03ebec51459b9af49892ddab2e9415dc |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
撰写
预览
正在加载...
取消
保存
Reference in new issue