Merged feature/unity_update_2022.3.3f1 into feature/v1.5.1
This commit is contained in:
shogo kimura
commit
a62f65b2db
|
|
@ -1,19 +1,2 @@
|
|||
popcorn/Library/
|
||||
popcorn/Assets/StreamingAssets/Data/
|
||||
Temp/
|
||||
obj/
|
||||
|
||||
*/*.csproj
|
||||
*/*.pidb
|
||||
*/*.sln
|
||||
*/*.userprefs
|
||||
|
||||
*/.vscode
|
||||
.vscode
|
||||
|
||||
InitializeUnityEditorChecker.cs
|
||||
|
||||
xcode/
|
||||
|
||||
.DS_Store
|
||||
_DS_Store
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
# usaya
|
||||
*/.vscode
|
||||
.vscode
|
||||
.idea
|
||||
xcode/
|
||||
|
||||
*/InitializeUnityEditorChecker.cs
|
||||
|
||||
# This .gitignore file should be placed at the root of your Unity project directory
|
||||
#
|
||||
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
|
||||
#
|
||||
/[Ll]ibrary/
|
||||
/[Tt]emp/
|
||||
/[Oo]bj/
|
||||
/[Bb]uild/
|
||||
/[Bb]uilds/
|
||||
/[Ll]ogs/
|
||||
/[Uu]ser[Ss]ettings/
|
||||
|
||||
# MemoryCaptures can get excessive in size.
|
||||
# They also could contain extremely sensitive data
|
||||
/[Mm]emoryCaptures/
|
||||
|
||||
# Recordings can get excessive in size
|
||||
/[Rr]ecordings/
|
||||
|
||||
# Uncomment this line if you wish to ignore the asset store tools plugin
|
||||
# /[Aa]ssets/AssetStoreTools*
|
||||
|
||||
# Autogenerated Jetbrains Rider plugin
|
||||
/[Aa]ssets/Plugins/Editor/JetBrains*
|
||||
|
||||
# Visual Studio cache directory
|
||||
.vs/
|
||||
|
||||
# Gradle cache directory
|
||||
.gradle/
|
||||
|
||||
# Autogenerated VS/MD/Consulo solution and project files
|
||||
ExportedObj/
|
||||
.consulo/
|
||||
*.csproj
|
||||
*.unityproj
|
||||
*.sln
|
||||
*.suo
|
||||
*.tmp
|
||||
*.user
|
||||
*.userprefs
|
||||
*.pidb
|
||||
*.booproj
|
||||
*.svd
|
||||
*.pdb
|
||||
*.mdb
|
||||
*.opendb
|
||||
*.VC.db
|
||||
|
||||
# Unity3D generated meta files
|
||||
*.pidb.meta
|
||||
*.pdb.meta
|
||||
*.mdb.meta
|
||||
|
||||
# Unity3D generated file on crash reports
|
||||
sysinfo.txt
|
||||
|
||||
# Builds
|
||||
*.apk
|
||||
*.aab
|
||||
*.unitypackage
|
||||
*.app
|
||||
|
||||
# Crashlytics generated file
|
||||
crashlytics-build.properties
|
||||
|
||||
# Packed Addressables
|
||||
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
|
||||
|
||||
# Temporary auto-generated Android Assets
|
||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||
Binary file not shown.
|
|
@ -1,13 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 65dd5cb1c5774b1cbf72bcc2214ea924
|
||||
labels:
|
||||
- gvh
|
||||
- gvh_rename_to_disable
|
||||
- gvh_version-1.2.169
|
||||
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.mdb
|
||||
- gvhp_targets-editor
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,13 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1f4515f9bdc74ab7be520e59a52eba96
|
||||
labels:
|
||||
- gvh
|
||||
- gvh_rename_to_disable
|
||||
- gvh_version-1.2.169
|
||||
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.mdb
|
||||
- gvhp_targets-editor
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,13 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b257c5dd89c04aa6a1004c7a19e936fb
|
||||
labels:
|
||||
- gvh
|
||||
- gvh_rename_to_disable
|
||||
- gvh_version-1.2.169
|
||||
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.mdb
|
||||
- gvhp_targets-editor
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,13 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 43f0f02ca8484767ae5cec73d99ce49c
|
||||
labels:
|
||||
- gvh
|
||||
- gvh_rename_to_disable
|
||||
- gvh_version-1.2.169
|
||||
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.mdb
|
||||
- gvhp_targets-editor
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,33 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: abf765bf3ce5f4d189d796a59a689c18
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,33 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: deecd3a85ccc84a13a0bf611ba4cdbac
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,33 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a4e527f4fff0443887e8a099e7f5c02
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,12 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a70a07fc09d84c579086381e5f2f0327
|
||||
labels:
|
||||
- gvh
|
||||
- gvh_version-1.2.169
|
||||
- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
|
||||
timeCreated: 1538009133
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,33 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b94960ef1b252403380dd890e1c05761
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Assets/ExternalDependencyManager/Editor/CHANGELOG.md
|
||||
Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll
|
||||
Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.mdb
|
||||
Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll
|
||||
Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.mdb
|
||||
Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll
|
||||
Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.mdb
|
||||
Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
|
||||
Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
|
||||
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll
|
||||
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.mdb
|
||||
Assets/ExternalDependencyManager/Editor/LICENSE
|
||||
Assets/ExternalDependencyManager/Editor/README.md
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 102cb82df4d3147bf867693f29bc5a03
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -71,6 +71,8 @@ TextureImporter:
|
|||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
|
|
@ -79,9 +81,9 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
|
|
@ -102,9 +104,12 @@ TextureImporter:
|
|||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 1
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
|
|
@ -504,6 +509,23 @@ TextureImporter:
|
|||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable:
|
||||
effect_Coin_12: 21300024
|
||||
effect_Coin_0: 21300000
|
||||
effect_Coin_3: 21300006
|
||||
effect_Coin_1: 21300002
|
||||
effect_Coin_9: 21300018
|
||||
effect_Coin_13: 21300026
|
||||
effect_Coin_11: 21300022
|
||||
effect_Coin_15: 21300030
|
||||
effect_Coin_6: 21300012
|
||||
effect_Coin_14: 21300028
|
||||
effect_Coin_7: 21300014
|
||||
effect_Coin_5: 21300010
|
||||
effect_Coin_2: 21300004
|
||||
effect_Coin_4: 21300008
|
||||
effect_Coin_8: 21300016
|
||||
effect_Coin_10: 21300020
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ ScriptedImporter:
|
|||
isReadable: 0
|
||||
streamingMipmaps: 1
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
nPOTScale: 1
|
||||
sRGBTexture: 1
|
||||
spriteMode: 2
|
||||
|
|
@ -42,6 +44,9 @@ ScriptedImporter:
|
|||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 0
|
||||
flipbookColumns: 0
|
||||
ignorePngGamma: 0
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
|
|
@ -75,7 +80,6 @@ ScriptedImporter:
|
|||
width: 0
|
||||
height: 0
|
||||
spriteID:
|
||||
internalID: 0
|
||||
spriteBone: []
|
||||
spriteOutline: []
|
||||
vertices: []
|
||||
|
|
@ -99,28 +103,43 @@ ScriptedImporter:
|
|||
width: 59
|
||||
height: 58
|
||||
spriteID: 827471f89de044e5ca0fc7b2034e9ae7
|
||||
internalID: 0
|
||||
spriteBone:
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 31.58712, y: 1.1717167, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.70710677, w: 0.7071068}
|
||||
length: 2.3434343
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 2.3434346, y: 0.0000004479379, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.007903503, w: 0.9999688}
|
||||
length: 18.530087
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 18.530087, y: -0.00000654333, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0005178731, w: 0.9999999}
|
||||
length: 14.867785
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 14.867794, y: 0.000001812525, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0036540132, w: 0.9999934}
|
||||
length: 19.626816
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
spriteOutline: []
|
||||
vertices:
|
||||
- position: {x: 40.381, y: 3.3430004}
|
||||
|
|
@ -1602,6 +1621,64 @@ ScriptedImporter:
|
|||
tessellationDetail: 0
|
||||
parentGroupIndex: -1
|
||||
uvTransform: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 31.58712, y: 1.1717166, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.70710677, w: 0.7071068}
|
||||
length: 2.3434343
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 2.3434343, y: 0.00000020951933, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.007903523, w: 0.99996877}
|
||||
length: 18.530088
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 18.530088, y: -0.0000064152086, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0005179005, w: 0.9999999}
|
||||
length: 14.867785
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 14.867787, y: 0.0000023044304, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0036540062, w: 0.9999933}
|
||||
length: 19.626812
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 59
|
||||
height: 58
|
||||
spriteId: 827471f89de044e5ca0fc7b2034e9ae7
|
||||
bones: 00000000010000000200000003000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
sharedRigSpriteImportData: []
|
||||
sharedRigCharacterData:
|
||||
bones: []
|
||||
parts: []
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
platformSettings:
|
||||
- name: Default
|
||||
overridden: 1
|
||||
|
|
@ -1615,21 +1692,19 @@ ScriptedImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
mosaicLayers: 1
|
||||
characterMode: 1
|
||||
documentPivot: {x: 0, y: 0}
|
||||
documentAlignment: 7
|
||||
importHiddenLayers: 0
|
||||
importedTextureWidth: 128
|
||||
importedTextureHeight: 128
|
||||
documentSize: {x: 59, y: 59}
|
||||
layerMappingOption: 2
|
||||
generatePhysicsShape: 0
|
||||
paperDollMode: 0
|
||||
keepDupilcateSpriteName: 0
|
||||
skeletonAssetReferenceID:
|
||||
spriteCategoryList:
|
||||
categories: []
|
||||
textureActualWidth: 128
|
||||
textureActualHeight: 128
|
||||
spritePackingTag:
|
||||
resliceFromLayer: 0
|
||||
characterMode: 1
|
||||
mosaicPSDLayers: []
|
||||
rigPSDLayers:
|
||||
- name: CornFieldImage
|
||||
|
|
@ -1639,42 +1714,14 @@ ScriptedImporter:
|
|||
spriteID: 827471f89de044e5ca0fc7b2034e9ae7
|
||||
layerID: 2
|
||||
mosaicPosition: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
position: {x: 31.58712, y: 1.1717166, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.70710677, w: 0.7071068}
|
||||
length: 2.3434343
|
||||
parentId: -1
|
||||
- name: bone_2
|
||||
position: {x: 2.3434343, y: 0.00000020951933, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.007903523, w: 0.99996877}
|
||||
length: 18.530088
|
||||
parentId: 0
|
||||
- name: bone_3
|
||||
position: {x: 18.530088, y: -0.0000064152086, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0005179005, w: 0.9999999}
|
||||
length: 14.867785
|
||||
parentId: 1
|
||||
- name: bone_4
|
||||
position: {x: 14.867787, y: 0.0000023044304, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0036540062, w: 0.9999933}
|
||||
length: 19.626812
|
||||
parentId: 2
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 59
|
||||
height: 58
|
||||
spriteId: 827471f89de044e5ca0fc7b2034e9ae7
|
||||
bones: 00000000010000000200000003000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
flatten: 0
|
||||
isImported: 1
|
||||
isVisible: 1
|
||||
sharedRigPSDLayers: []
|
||||
pSDLayerImportSetting: []
|
||||
generateGOHierarchy: 0
|
||||
textureAssetName: CornField_Seedling_one_a Texture
|
||||
prefabAssetName: CornField_Seedling_one_a Prefab
|
||||
spriteLibAssetName: CornField_Seedling_one_a Sprite Lib
|
||||
skeletonAssetName:
|
||||
secondarySpriteTextures: []
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ ScriptedImporter:
|
|||
isReadable: 0
|
||||
streamingMipmaps: 1
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
nPOTScale: 1
|
||||
sRGBTexture: 1
|
||||
spriteMode: 2
|
||||
|
|
@ -42,6 +44,9 @@ ScriptedImporter:
|
|||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 0
|
||||
flipbookColumns: 0
|
||||
ignorePngGamma: 0
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
|
|
@ -75,7 +80,6 @@ ScriptedImporter:
|
|||
width: 0
|
||||
height: 0
|
||||
spriteID:
|
||||
internalID: 0
|
||||
spriteBone: []
|
||||
spriteOutline: []
|
||||
vertices: []
|
||||
|
|
@ -99,33 +103,52 @@ ScriptedImporter:
|
|||
width: 108
|
||||
height: 201
|
||||
spriteID: 79ae964e0e16a0747bf511f5aa064895
|
||||
internalID: 0
|
||||
spriteBone:
|
||||
- name: bone_1
|
||||
guid:
|
||||
position: {x: 65.80114, y: 0.5075531, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.7358828, w: 0.677109}
|
||||
length: 3.05601
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 3.0560102, y: -0.0000018058179, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.04155915, w: 0.99913603}
|
||||
length: 50.503777
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 50.503777, y: 0.000007915459, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.002857596, w: 0.99999595}
|
||||
length: 44.413605
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 44.413605, y: -0.00001226716, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.011758079, w: 0.99993086}
|
||||
length: 43.416275
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 43.416264, y: -0.0000928838, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.019731237, w: 0.99980533}
|
||||
length: 55.45656
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
spriteOutline: []
|
||||
vertices:
|
||||
- position: {x: 69.699, y: 0.41699982}
|
||||
|
|
@ -2610,59 +2633,53 @@ ScriptedImporter:
|
|||
tessellationDetail: 0
|
||||
parentGroupIndex: -1
|
||||
uvTransform: {x: 4, y: 4}
|
||||
platformSettings: []
|
||||
mosaicLayers: 1
|
||||
documentPivot: {x: 0, y: 0}
|
||||
documentAlignment: 7
|
||||
importHiddenLayers: 0
|
||||
importedTextureWidth: 128
|
||||
importedTextureHeight: 256
|
||||
documentSize: {x: 108, y: 201}
|
||||
paperDollMode: 0
|
||||
keepDupilcateSpriteName: 0
|
||||
spriteCategoryList:
|
||||
categories: []
|
||||
textureActualWidth: 128
|
||||
textureActualHeight: 256
|
||||
spritePackingTag:
|
||||
resliceFromLayer: 0
|
||||
characterMode: 1
|
||||
mosaicPSDLayers: []
|
||||
rigPSDLayers:
|
||||
- name: CornFieldImage
|
||||
spriteName: CornFieldImage
|
||||
isGroup: 0
|
||||
parentIndex: -1
|
||||
spriteID: 79ae964e0e16a0747bf511f5aa064895
|
||||
layerID: 4
|
||||
mosaicPosition: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_1
|
||||
guid:
|
||||
position: {x: 65.80114, y: 0.50755334, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.7358828, w: 0.677109}
|
||||
length: 3.0560098
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 3.0560098, y: 0.0000011744144, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.041559163, w: 0.99913603}
|
||||
length: 50.503777
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 50.503777, y: 0.0000035431344, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.002857593, w: 0.99999595}
|
||||
length: 44.413605
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 44.413605, y: -0.000000741966, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.011758102, w: 0.99993086}
|
||||
length: 43.41627
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 43.41627, y: -0.00009421995, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.019731231, w: 0.99980533}
|
||||
length: 55.456562
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
|
|
@ -2675,8 +2692,46 @@ ScriptedImporter:
|
|||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
sharedRigSpriteImportData: []
|
||||
sharedRigCharacterData:
|
||||
bones: []
|
||||
parts: []
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
platformSettings: []
|
||||
mosaicLayers: 1
|
||||
characterMode: 1
|
||||
documentPivot: {x: 0, y: 0}
|
||||
documentAlignment: 7
|
||||
importHiddenLayers: 0
|
||||
layerMappingOption: 2
|
||||
generatePhysicsShape: 0
|
||||
paperDollMode: 0
|
||||
keepDupilcateSpriteName: 0
|
||||
skeletonAssetReferenceID:
|
||||
spriteCategoryList:
|
||||
categories: []
|
||||
spritePackingTag:
|
||||
resliceFromLayer: 0
|
||||
mosaicPSDLayers: []
|
||||
rigPSDLayers:
|
||||
- name: CornFieldImage
|
||||
spriteName: CornFieldImage
|
||||
isGroup: 0
|
||||
parentIndex: -1
|
||||
spriteID: 79ae964e0e16a0747bf511f5aa064895
|
||||
layerID: 4
|
||||
mosaicPosition: {x: 4, y: 4}
|
||||
flatten: 0
|
||||
isImported: 1
|
||||
isVisible: 1
|
||||
sharedRigPSDLayers: []
|
||||
pSDLayerImportSetting: []
|
||||
generateGOHierarchy: 0
|
||||
textureAssetName: CornField_Seedling_one_b Texture
|
||||
prefabAssetName: CornField_Seedling_one_b Prefab
|
||||
spriteLibAssetName: CornField_Seedling_one_b Sprite Lib
|
||||
skeletonAssetName:
|
||||
secondarySpriteTextures: []
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ ScriptedImporter:
|
|||
isReadable: 0
|
||||
streamingMipmaps: 1
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
nPOTScale: 1
|
||||
sRGBTexture: 1
|
||||
spriteMode: 2
|
||||
|
|
@ -42,6 +44,9 @@ ScriptedImporter:
|
|||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 0
|
||||
flipbookColumns: 0
|
||||
ignorePngGamma: 0
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
|
|
@ -75,7 +80,6 @@ ScriptedImporter:
|
|||
width: 0
|
||||
height: 0
|
||||
spriteID:
|
||||
internalID: 0
|
||||
spriteBone: []
|
||||
spriteOutline: []
|
||||
vertices: []
|
||||
|
|
@ -99,33 +103,52 @@ ScriptedImporter:
|
|||
width: 149
|
||||
height: 221
|
||||
spriteID: 50a37d7fc06805541884434b7897375c
|
||||
internalID: 0
|
||||
spriteBone:
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 72.34912, y: 0.83712673, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
|
||||
length: 4.185606
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 4.1856065, y: 0.00000039653654, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0026632594, w: 0.9999965}
|
||||
length: 52.46034
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 52.46034, y: -0.00003882429, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.0026632594, w: 0.9999965}
|
||||
length: 49.111103
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 49.111103, y: 0.0000035619328, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.0058847526, w: 0.9999827}
|
||||
length: 47.440155
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 47.440155, y: -0.0000027597519, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.010697684, w: 0.99994284}
|
||||
length: 58.909935
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
spriteOutline: []
|
||||
vertices:
|
||||
- position: {x: 76.464, y: 0.46499634}
|
||||
|
|
@ -1751,6 +1774,73 @@ ScriptedImporter:
|
|||
tessellationDetail: 0
|
||||
parentGroupIndex: -1
|
||||
uvTransform: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 72.34912, y: 0.8371266, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
|
||||
length: 4.185606
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 4.185606, y: 0.00000039653648, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.00266326, w: 0.9999965}
|
||||
length: 52.46034
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 52.46034, y: -0.00003917996, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.00266326, w: 0.9999965}
|
||||
length: 49.111103
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 49.111103, y: 0.000003562603, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.0058847526, w: 0.9999827}
|
||||
length: 47.440155
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 47.440155, y: -0.0000013031635, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.010697684, w: 0.99994284}
|
||||
length: 58.909927
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 149
|
||||
height: 221
|
||||
spriteId: 50a37d7fc06805541884434b7897375c
|
||||
bones: 0000000001000000020000000300000004000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
sharedRigSpriteImportData: []
|
||||
sharedRigCharacterData:
|
||||
bones: []
|
||||
parts: []
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
platformSettings:
|
||||
- name: Default
|
||||
overridden: 1
|
||||
|
|
@ -1764,21 +1854,19 @@ ScriptedImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
mosaicLayers: 1
|
||||
characterMode: 1
|
||||
documentPivot: {x: 0, y: 0}
|
||||
documentAlignment: 7
|
||||
importHiddenLayers: 0
|
||||
importedTextureWidth: 256
|
||||
importedTextureHeight: 256
|
||||
documentSize: {x: 149, y: 221}
|
||||
layerMappingOption: 2
|
||||
generatePhysicsShape: 0
|
||||
paperDollMode: 0
|
||||
keepDupilcateSpriteName: 0
|
||||
skeletonAssetReferenceID:
|
||||
spriteCategoryList:
|
||||
categories: []
|
||||
textureActualWidth: 256
|
||||
textureActualHeight: 256
|
||||
spritePackingTag:
|
||||
resliceFromLayer: 0
|
||||
characterMode: 1
|
||||
mosaicPSDLayers: []
|
||||
rigPSDLayers:
|
||||
- name: CornFieldImage
|
||||
|
|
@ -1788,47 +1876,14 @@ ScriptedImporter:
|
|||
spriteID: 50a37d7fc06805541884434b7897375c
|
||||
layerID: 4
|
||||
mosaicPosition: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
position: {x: 72.34912, y: 0.8371266, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
|
||||
length: 4.185606
|
||||
parentId: -1
|
||||
- name: bone_2
|
||||
position: {x: 4.185606, y: 0.00000039653648, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.00266326, w: 0.9999965}
|
||||
length: 52.46034
|
||||
parentId: 0
|
||||
- name: bone_3
|
||||
position: {x: 52.46034, y: -0.00003917996, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.00266326, w: 0.9999965}
|
||||
length: 49.111103
|
||||
parentId: 1
|
||||
- name: bone_4
|
||||
position: {x: 49.111103, y: 0.000003562603, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.0058847526, w: 0.9999827}
|
||||
length: 47.440155
|
||||
parentId: 2
|
||||
- name: bone_5
|
||||
position: {x: 47.440155, y: -0.0000013031635, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.010697684, w: 0.99994284}
|
||||
length: 58.909927
|
||||
parentId: 3
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 149
|
||||
height: 221
|
||||
spriteId: 50a37d7fc06805541884434b7897375c
|
||||
bones: 0000000001000000020000000300000004000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
flatten: 0
|
||||
isImported: 1
|
||||
isVisible: 1
|
||||
sharedRigPSDLayers: []
|
||||
pSDLayerImportSetting: []
|
||||
generateGOHierarchy: 0
|
||||
textureAssetName: CornField_Seedling_one_c Texture
|
||||
prefabAssetName: CornField_Seedling_one_c Prefab
|
||||
spriteLibAssetName: CornField_Seedling_one_c Sprite Lib
|
||||
skeletonAssetName:
|
||||
secondarySpriteTextures: []
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ ScriptedImporter:
|
|||
isReadable: 0
|
||||
streamingMipmaps: 1
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
nPOTScale: 1
|
||||
sRGBTexture: 1
|
||||
spriteMode: 2
|
||||
|
|
@ -42,6 +44,9 @@ ScriptedImporter:
|
|||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 0
|
||||
flipbookColumns: 0
|
||||
ignorePngGamma: 0
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
|
|
@ -75,7 +80,6 @@ ScriptedImporter:
|
|||
width: 0
|
||||
height: 0
|
||||
spriteID:
|
||||
internalID: 0
|
||||
spriteBone: []
|
||||
spriteOutline: []
|
||||
vertices: []
|
||||
|
|
@ -99,33 +103,52 @@ ScriptedImporter:
|
|||
width: 149
|
||||
height: 246
|
||||
spriteID: d5df2143585b6ae4c9fd4de61d0901d1
|
||||
internalID: 0
|
||||
spriteBone:
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 3.4447021, y: 0.0000017788027, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.047875233, w: 0.9988533}
|
||||
length: 60.815212
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 72.66099, y: 0.6237354, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.6743385, w: 0.7384224}
|
||||
length: 3.4447036
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 60.815205, y: -0.0000048932566, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0025663609, w: 0.9999968}
|
||||
length: 57.695694
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 57.695694, y: 0.000007742276, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.005213397, w: 0.9999864}
|
||||
length: 59.882072
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 59.88206, y: 0.000022549859, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.0024417823, w: 0.9999971}
|
||||
length: 61.133434
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
spriteOutline: []
|
||||
vertices:
|
||||
- position: {x: 76.464, y: 0.46499634}
|
||||
|
|
@ -2227,6 +2250,73 @@ ScriptedImporter:
|
|||
tessellationDetail: 0
|
||||
parentGroupIndex: -1
|
||||
uvTransform: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
guid:
|
||||
position: {x: 72.66099, y: 0.62373537, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.6743385, w: 0.7384224}
|
||||
length: 3.444703
|
||||
parentId: -1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_2
|
||||
guid:
|
||||
position: {x: 3.444703, y: -0.000002721348, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.047875226, w: 0.9988533}
|
||||
length: 60.81521
|
||||
parentId: 0
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_3
|
||||
guid:
|
||||
position: {x: 60.815205, y: 0.0000000221699, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0025663814, w: 0.9999967}
|
||||
length: 57.695694
|
||||
parentId: 1
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_4
|
||||
guid:
|
||||
position: {x: 57.695694, y: 0.0000026288344, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.005213418, w: 0.9999864}
|
||||
length: 59.88206
|
||||
parentId: 2
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
- name: bone_5
|
||||
guid:
|
||||
position: {x: 59.882057, y: 0.000021350917, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.002441789, w: 0.999997}
|
||||
length: 61.13343
|
||||
parentId: 3
|
||||
color:
|
||||
serializedVersion: 2
|
||||
rgba: 0
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 149
|
||||
height: 246
|
||||
spriteId: d5df2143585b6ae4c9fd4de61d0901d1
|
||||
bones: 0100000000000000020000000300000004000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
sharedRigSpriteImportData: []
|
||||
sharedRigCharacterData:
|
||||
bones: []
|
||||
parts: []
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
boneReadOnly: 0
|
||||
platformSettings:
|
||||
- name: Default
|
||||
overridden: 1
|
||||
|
|
@ -2240,21 +2330,19 @@ ScriptedImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
mosaicLayers: 1
|
||||
characterMode: 1
|
||||
documentPivot: {x: 0, y: 0}
|
||||
documentAlignment: 7
|
||||
importHiddenLayers: 0
|
||||
importedTextureWidth: 256
|
||||
importedTextureHeight: 256
|
||||
documentSize: {x: 149, y: 246}
|
||||
layerMappingOption: 2
|
||||
generatePhysicsShape: 0
|
||||
paperDollMode: 0
|
||||
keepDupilcateSpriteName: 0
|
||||
skeletonAssetReferenceID:
|
||||
spriteCategoryList:
|
||||
categories: []
|
||||
textureActualWidth: 256
|
||||
textureActualHeight: 256
|
||||
spritePackingTag:
|
||||
resliceFromLayer: 0
|
||||
characterMode: 1
|
||||
mosaicPSDLayers: []
|
||||
rigPSDLayers:
|
||||
- name: CornFieldImage
|
||||
|
|
@ -2264,47 +2352,14 @@ ScriptedImporter:
|
|||
spriteID: d5df2143585b6ae4c9fd4de61d0901d1
|
||||
layerID: 4
|
||||
mosaicPosition: {x: 4, y: 4}
|
||||
characterData:
|
||||
bones:
|
||||
- name: bone_root
|
||||
position: {x: 72.66099, y: 0.62373537, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.6743385, w: 0.7384224}
|
||||
length: 3.444703
|
||||
parentId: -1
|
||||
- name: bone_2
|
||||
position: {x: 3.444703, y: -0.000002721348, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.047875226, w: 0.9988533}
|
||||
length: 60.81521
|
||||
parentId: 0
|
||||
- name: bone_3
|
||||
position: {x: 60.815205, y: 0.0000000221699, z: 0}
|
||||
rotation: {x: 0, y: 0, z: -0.0025663814, w: 0.9999967}
|
||||
length: 57.695694
|
||||
parentId: 1
|
||||
- name: bone_4
|
||||
position: {x: 57.695694, y: 0.0000026288344, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.005213418, w: 0.9999864}
|
||||
length: 59.88206
|
||||
parentId: 2
|
||||
- name: bone_5
|
||||
position: {x: 59.882057, y: 0.000021350917, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0.002441789, w: 0.999997}
|
||||
length: 61.13343
|
||||
parentId: 3
|
||||
parts:
|
||||
- spritePosition:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 149
|
||||
height: 246
|
||||
spriteId: d5df2143585b6ae4c9fd4de61d0901d1
|
||||
bones: 0100000000000000020000000300000004000000
|
||||
parentGroup: 0
|
||||
order: 0
|
||||
dimension: {x: 0, y: 0}
|
||||
characterGroups: []
|
||||
flatten: 0
|
||||
isImported: 1
|
||||
isVisible: 1
|
||||
sharedRigPSDLayers: []
|
||||
pSDLayerImportSetting: []
|
||||
generateGOHierarchy: 0
|
||||
textureAssetName: CornField_Seedling_one_d Texture
|
||||
prefabAssetName: CornField_Seedling_one_d Prefab
|
||||
spriteLibAssetName: CornField_Seedling_one_d Sprite Lib
|
||||
skeletonAssetName:
|
||||
secondarySpriteTextures: []
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -2,7 +2,7 @@ using UnityEngine;
|
|||
|
||||
public static class Const {
|
||||
|
||||
public static readonly string UnityVersion = "2019.4.19f1";
|
||||
public static readonly string UnityVersion = "2021.3.3f1";
|
||||
|
||||
public static readonly string DefaultAppVersion = "1.1.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public class BuildCompressedPlayer : MonoBehaviour {
|
|||
}
|
||||
|
||||
static void Build(string locationPathName, BuildTarget buildTarget){
|
||||
BuildOptions opt = BuildOptions.SymlinkLibraries;
|
||||
BuildOptions opt = BuildOptions.SymlinkSources;
|
||||
// opt |= BuildOptions.Development;
|
||||
opt |= BuildOptions.CompressWithLz4;
|
||||
BuildPipeline.BuildPlayer(EditorBuildSettings.scenes, locationPathName, buildTarget, opt);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public class DevelopmentBuilder : IPreprocessBuildWithReport {
|
|||
|
||||
public void OnPreprocessBuild(BuildReport report) {
|
||||
UnityEditor.EditorUserBuildSettings.development = true;
|
||||
UnityEditor.EditorUserBuildSettings.iOSBuildConfigType = UnityEditor.iOSBuildType.Debug;
|
||||
UnityEditor.EditorUserBuildSettings.iOSXcodeBuildConfig = UnityEditor.XcodeBuildConfig.Debug;
|
||||
UnityEditor.AssetDatabase.SaveAssets();
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#if UNITY_EDITOR
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor.Experimental.SceneManagement;
|
||||
|
||||
#endif
|
||||
|
||||
public sealed class PrefabInPrefabSwapper : MonoBehaviour {
|
||||
|
|
@ -39,7 +39,7 @@ public sealed class PrefabInPrefabSwapper : MonoBehaviour {
|
|||
}
|
||||
});
|
||||
foreach(var from in swapList){
|
||||
var to = (UnityEditor.PrefabUtility.InstantiatePrefab(info.SwapPrefab, PrefabStageUtility.GetCurrentPrefabStage().scene) as GameObject).transform;
|
||||
var to = (UnityEditor.PrefabUtility.InstantiatePrefab(info.SwapPrefab, UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage().scene) as GameObject).transform;
|
||||
to.parent = from.parent;
|
||||
to.localPosition = from.localPosition;
|
||||
to.localRotation = from.localRotation;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"com.coffee.unmask": "https://github.com/mob-sakai/UnmaskForUGUI.git",
|
||||
"com.unity.2d.animation": "3.2.6",
|
||||
"com.unity.2d.pixel-perfect": "2.1.0",
|
||||
"com.unity.2d.psdimporter": "2.1.6",
|
||||
"com.unity.2d.animation": "7.0.5",
|
||||
"com.unity.2d.pixel-perfect": "5.0.1",
|
||||
"com.unity.2d.psdimporter": "6.0.3",
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.2d.spriteshape": "3.0.14",
|
||||
"com.unity.2d.spriteshape": "7.0.4",
|
||||
"com.unity.2d.tilemap": "1.0.0",
|
||||
"com.unity.burst": "1.4.8",
|
||||
"com.unity.collab-proxy": "1.2.16",
|
||||
"com.unity.collections": "0.9.0-preview.6",
|
||||
"com.unity.ide.rider": "1.1.4",
|
||||
"com.unity.ide.vscode": "1.2.3",
|
||||
"com.unity.recorder": "3.0.2",
|
||||
"com.unity.test-framework": "1.1.20",
|
||||
"com.unity.textmeshpro": "2.1.1",
|
||||
"com.unity.timeline": "1.2.17",
|
||||
"com.unity.burst": "1.6.5",
|
||||
"com.unity.collab-proxy": "1.15.16",
|
||||
"com.unity.collections": "1.2.3",
|
||||
"com.unity.ide.rider": "3.0.14",
|
||||
"com.unity.ide.vscode": "1.2.5",
|
||||
"com.unity.ide.visualstudio": "2.0.15",
|
||||
"com.unity.recorder": "3.0.3",
|
||||
"com.unity.test-framework": "1.1.31",
|
||||
"com.unity.textmeshpro": "3.0.6",
|
||||
"com.unity.timeline": "1.6.4",
|
||||
"com.unity.ugui": "1.0.0",
|
||||
"jp.amagamina.reference-viewer": "https://github.com/ina-amagami/unity-reference-viewer.git",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@
|
|||
"hash": "bba7df9616502051c4ab993077fb53316fd760a0"
|
||||
},
|
||||
"com.unity.2d.animation": {
|
||||
"version": "3.2.6",
|
||||
"version": "7.0.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.2d.common": "2.1.0",
|
||||
"com.unity.mathematics": "1.1.0",
|
||||
"com.unity.2d.common": "6.0.3",
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.uielements": "1.0.0"
|
||||
|
|
@ -21,36 +20,38 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.common": {
|
||||
"version": "2.1.0",
|
||||
"version": "6.0.3",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.modules.uielements": "1.0.0"
|
||||
"com.unity.mathematics": "1.1.0",
|
||||
"com.unity.modules.uielements": "1.0.0",
|
||||
"com.unity.burst": "1.5.1"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.path": {
|
||||
"version": "2.1.0",
|
||||
"version": "5.0.2",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.pixel-perfect": {
|
||||
"version": "2.1.0",
|
||||
"version": "5.0.1",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.psdimporter": {
|
||||
"version": "2.1.6",
|
||||
"version": "6.0.3",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.2d.common": "2.0.2",
|
||||
"com.unity.2d.animation": "3.2.5",
|
||||
"com.unity.2d.animation": "7.0.4",
|
||||
"com.unity.2d.common": "6.0.3",
|
||||
"com.unity.2d.sprite": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
@ -62,13 +63,14 @@
|
|||
"dependencies": {}
|
||||
},
|
||||
"com.unity.2d.spriteshape": {
|
||||
"version": "3.0.14",
|
||||
"version": "7.0.4",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.mathematics": "1.1.0",
|
||||
"com.unity.2d.common": "2.0.2",
|
||||
"com.unity.2d.path": "2.0.6"
|
||||
"com.unity.2d.common": "6.0.3",
|
||||
"com.unity.2d.path": "5.0.2",
|
||||
"com.unity.modules.physics2d": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -79,7 +81,7 @@
|
|||
"dependencies": {}
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.4.8",
|
||||
"version": "1.6.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -88,19 +90,21 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.collab-proxy": {
|
||||
"version": "1.2.16",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.collections": {
|
||||
"version": "0.9.0-preview.6",
|
||||
"version": "1.15.16",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.test-framework.performance": "2.0.8-preview",
|
||||
"com.unity.burst": "1.3.0-preview.12"
|
||||
"com.unity.services.core": "1.0.1"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.collections": {
|
||||
"version": "1.2.3",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.burst": "1.6.4",
|
||||
"com.unity.test-framework": "1.1.31"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -112,37 +116,46 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
"version": "1.1.4",
|
||||
"version": "3.0.14",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.1"
|
||||
"com.unity.ext.nunit": "1.0.6"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ide.vscode": {
|
||||
"version": "1.2.3",
|
||||
"version": "1.2.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ide.visualstudio": {
|
||||
"version": "2.0.15",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.9"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.mathematics": {
|
||||
"version": "1.2.1",
|
||||
"version": "1.2.6",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.nuget.newtonsoft-json": {
|
||||
"version": "2.0.0-preview",
|
||||
"version": "3.0.2",
|
||||
"depth": 2,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.recorder": {
|
||||
"version": "3.0.2",
|
||||
"version": "3.0.3",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -150,8 +163,19 @@
|
|||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.services.core": {
|
||||
"version": "1.3.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.nuget.newtonsoft-json": "3.0.2",
|
||||
"com.unity.modules.androidjni": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.test-framework": {
|
||||
"version": "1.1.20",
|
||||
"version": "1.1.31",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -161,18 +185,8 @@
|
|||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.test-framework.performance": {
|
||||
"version": "2.0.8-preview",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.0",
|
||||
"com.unity.nuget.newtonsoft-json": "2.0.0-preview"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.textmeshpro": {
|
||||
"version": "2.1.1",
|
||||
"version": "3.0.6",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -181,10 +195,15 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.timeline": {
|
||||
"version": "1.2.17",
|
||||
"version": "1.6.4",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"dependencies": {
|
||||
"com.unity.modules.director": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ugui": {
|
||||
|
|
@ -336,6 +355,18 @@
|
|||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.modules.ui": "1.0.0",
|
||||
"com.unity.modules.imgui": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0",
|
||||
"com.unity.modules.uielementsnative": "1.0.0"
|
||||
}
|
||||
},
|
||||
"com.unity.modules.uielementsnative": {
|
||||
"version": "1.0.0",
|
||||
"depth": 1,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.modules.ui": "1.0.0",
|
||||
"com.unity.modules.imgui": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<projectSettings>
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
|
||||
<projectSetting name="Google.IOSResolver.AutoPodToolInstallInEditor" value="True" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!387306366 &1
|
||||
MemorySettings:
|
||||
m_ObjectHideFlags: 0
|
||||
m_EditorMemorySettings:
|
||||
m_MainAllocatorBlockSize: -1
|
||||
m_ThreadAllocatorBlockSize: -1
|
||||
m_MainGfxBlockSize: -1
|
||||
m_ThreadGfxBlockSize: -1
|
||||
m_CacheBlockSize: -1
|
||||
m_TypetreeBlockSize: -1
|
||||
m_ProfilerBlockSize: -1
|
||||
m_ProfilerEditorBlockSize: -1
|
||||
m_BucketAllocatorGranularity: -1
|
||||
m_BucketAllocatorBucketsCount: -1
|
||||
m_BucketAllocatorBlockSize: -1
|
||||
m_BucketAllocatorBlockCount: -1
|
||||
m_ProfilerBucketAllocatorGranularity: -1
|
||||
m_ProfilerBucketAllocatorBucketsCount: -1
|
||||
m_ProfilerBucketAllocatorBlockSize: -1
|
||||
m_ProfilerBucketAllocatorBlockCount: -1
|
||||
m_TempAllocatorSizeMain: -1
|
||||
m_JobTempAllocatorBlockSize: -1
|
||||
m_BackgroundJobTempAllocatorBlockSize: -1
|
||||
m_JobTempAllocatorReducedBlockSize: -1
|
||||
m_TempAllocatorSizeGIBakingWorker: -1
|
||||
m_TempAllocatorSizeNavMeshWorker: -1
|
||||
m_TempAllocatorSizeAudioWorker: -1
|
||||
m_TempAllocatorSizeCloudWorker: -1
|
||||
m_TempAllocatorSizeGfx: -1
|
||||
m_TempAllocatorSizeJobWorker: -1
|
||||
m_TempAllocatorSizeBackgroundWorker: -1
|
||||
m_TempAllocatorSizePreloadManager: -1
|
||||
m_PlatformMemorySettings: {}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
--- !u!129 &1
|
||||
PlayerSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 20
|
||||
serializedVersion: 23
|
||||
productGUID: da0596332854f406e9e3025b07f64794
|
||||
AndroidProfiler: 0
|
||||
AndroidFilterTouchesWhenObscured: 0
|
||||
|
|
@ -52,6 +52,8 @@ PlayerSettings:
|
|||
m_StereoRenderingPath: 0
|
||||
m_ActiveColorSpace: 0
|
||||
m_MTRendering: 1
|
||||
mipStripping: 0
|
||||
numberOfMipsStripped: 0
|
||||
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
|
||||
iosShowActivityIndicatorOnLoading: -1
|
||||
androidShowActivityIndicatorOnLoading: -1
|
||||
|
|
@ -69,6 +71,12 @@ PlayerSettings:
|
|||
androidRenderOutsideSafeArea: 1
|
||||
androidUseSwappy: 0
|
||||
androidBlitType: 0
|
||||
androidResizableWindow: 0
|
||||
androidDefaultWindowWidth: 1920
|
||||
androidDefaultWindowHeight: 1080
|
||||
androidMinimumWindowWidth: 400
|
||||
androidMinimumWindowHeight: 300
|
||||
androidFullscreenMode: 1
|
||||
defaultIsNativeResolution: 1
|
||||
macRetinaSupport: 1
|
||||
runInBackground: 1
|
||||
|
|
@ -120,7 +128,9 @@ PlayerSettings:
|
|||
stadiaTargetFramerate: 0
|
||||
vulkanNumSwapchainBuffers: 3
|
||||
vulkanEnableSetSRGBWrite: 0
|
||||
vulkanEnablePreTransform: 0
|
||||
vulkanEnableLateAcquireNextImage: 0
|
||||
vulkanEnableCommandBufferRecycling: 1
|
||||
m_SupportedAspectRatios:
|
||||
4:3: 1
|
||||
5:4: 1
|
||||
|
|
@ -135,48 +145,28 @@ PlayerSettings:
|
|||
xboxOneDisableKinectGpuReservation: 1
|
||||
xboxOneEnable7thCore: 1
|
||||
vrSettings:
|
||||
cardboard:
|
||||
depthFormat: 0
|
||||
enableTransitionView: 0
|
||||
daydream:
|
||||
depthFormat: 0
|
||||
useSustainedPerformanceMode: 0
|
||||
enableVideoLayer: 0
|
||||
useProtectedVideoMemory: 0
|
||||
minimumSupportedHeadTracking: 0
|
||||
maximumSupportedHeadTracking: 1
|
||||
hololens:
|
||||
depthFormat: 1
|
||||
depthBufferSharingEnabled: 1
|
||||
lumin:
|
||||
depthFormat: 0
|
||||
frameTiming: 2
|
||||
enableGLCache: 0
|
||||
glCacheMaxBlobSize: 524288
|
||||
glCacheMaxFileSize: 8388608
|
||||
oculus:
|
||||
sharedDepthBuffer: 1
|
||||
dashSupport: 1
|
||||
lowOverheadMode: 0
|
||||
protectedContext: 0
|
||||
v2Signing: 1
|
||||
enable360StereoCapture: 0
|
||||
isWsaHolographicRemotingEnabled: 0
|
||||
enableFrameTimingStats: 0
|
||||
enableOpenGLProfilerGPURecorders: 1
|
||||
useHDRDisplay: 0
|
||||
D3DHDRBitDepth: 0
|
||||
m_ColorGamuts: 00000000
|
||||
targetPixelDensity: 30
|
||||
resolutionScalingMode: 0
|
||||
resetResolutionOnWindowResize: 0
|
||||
androidSupportedAspectRatio: 1
|
||||
androidMaxAspectRatio: 2.1
|
||||
applicationIdentifier:
|
||||
Android: jp.usaya.popcorn
|
||||
iPhone: jp.usaya.popcorn
|
||||
buildNumber:
|
||||
Standalone: 0
|
||||
iPhone: 2
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 1
|
||||
AndroidBundleVersionCode: 3
|
||||
AndroidMinSdkVersion: 21
|
||||
AndroidMinSdkVersion: 22
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 1
|
||||
aotOptions:
|
||||
|
|
@ -191,10 +181,10 @@ PlayerSettings:
|
|||
StripUnusedMeshComponents: 1
|
||||
VertexChannelCompressionMask: 4054
|
||||
iPhoneSdkVersion: 988
|
||||
iOSTargetOSVersionString: 10.0
|
||||
iOSTargetOSVersionString: 11.0
|
||||
tvOSSdkVersion: 0
|
||||
tvOSRequireExtendedGameController: 0
|
||||
tvOSTargetOSVersionString: 10.0
|
||||
tvOSTargetOSVersionString: 11.0
|
||||
uIPrerenderedIcon: 0
|
||||
uIRequiresPersistentWiFi: 0
|
||||
uIRequiresFullScreen: 1
|
||||
|
|
@ -228,10 +218,11 @@ PlayerSettings:
|
|||
iOSLaunchScreeniPadFillPct: 100
|
||||
iOSLaunchScreeniPadSize: 100
|
||||
iOSLaunchScreeniPadCustomXibPath:
|
||||
iOSUseLaunchScreenStoryboard: 0
|
||||
iOSLaunchScreenCustomStoryboardPath:
|
||||
iOSLaunchScreeniPadCustomStoryboardPath:
|
||||
iOSDeviceRequirements: []
|
||||
iOSURLSchemes: []
|
||||
macOSURLSchemes: []
|
||||
iOSBackgroundModes: 0
|
||||
iOSMetalForceHardShadows: 0
|
||||
metalEditorSupport: 1
|
||||
|
|
@ -247,10 +238,19 @@ PlayerSettings:
|
|||
iOSRequireARKit: 0
|
||||
iOSAutomaticallyDetectAndAddCapabilities: 1
|
||||
appleEnableProMotion: 0
|
||||
shaderPrecisionModel: 0
|
||||
clonedFromGUID: 5f34be1353de5cf4398729fda238591b
|
||||
templatePackageId: com.unity.template.2d@3.3.2
|
||||
templateDefaultScene: Assets/Scenes/SampleScene.unity
|
||||
useCustomMainManifest: 0
|
||||
useCustomLauncherManifest: 0
|
||||
useCustomMainGradleTemplate: 0
|
||||
useCustomLauncherGradleManifest: 0
|
||||
useCustomBaseGradleTemplate: 0
|
||||
useCustomGradlePropertiesTemplate: 0
|
||||
useCustomProguardFile: 0
|
||||
AndroidTargetArchitectures: 2
|
||||
AndroidTargetDevices: 0
|
||||
AndroidSplashScreenScale: 0
|
||||
androidSplashScreen: {fileID: 0}
|
||||
AndroidKeystoreName: "/Volumes/GoogleDrive/\u30DE\u30A4\u30C8\u3099\u30E9\u30A4\u30D5\u3099/\u30A2\u30D5\u309A\u30EA\u4E00\u89A7/_\u5171\u901A/android_keys/unity/popcorn/key/popcorn.keystore"
|
||||
|
|
@ -267,6 +267,10 @@ PlayerSettings:
|
|||
height: 180
|
||||
banner: {fileID: 0}
|
||||
androidGamepadSupportLevel: 0
|
||||
chromeosInputEmulation: 1
|
||||
AndroidMinifyWithR8: 0
|
||||
AndroidMinifyRelease: 0
|
||||
AndroidMinifyDebug: 0
|
||||
AndroidValidateAppBundleSize: 1
|
||||
AndroidAppBundleSizeToValidate: 150
|
||||
m_BuildTargetIcons:
|
||||
|
|
@ -505,7 +509,10 @@ PlayerSettings:
|
|||
m_BuildTargetGraphicsAPIs:
|
||||
- m_BuildTarget: AndroidPlayer
|
||||
m_APIs: 150000000b000000
|
||||
m_Automatic: 0
|
||||
m_Automatic: 1
|
||||
- m_BuildTarget: iOSSupport
|
||||
m_APIs: 10000000
|
||||
m_Automatic: 1
|
||||
m_BuildTargetVRSettings: []
|
||||
openGLRequireES31: 0
|
||||
openGLRequireES31AEP: 0
|
||||
|
|
@ -517,6 +524,8 @@ PlayerSettings:
|
|||
tvOS: 1
|
||||
m_BuildTargetGroupLightmapEncodingQuality: []
|
||||
m_BuildTargetGroupLightmapSettings: []
|
||||
m_BuildTargetNormalMapEncoding: []
|
||||
m_BuildTargetDefaultTextureCompressionFormat: []
|
||||
playModeTestRunnerEnabled: 0
|
||||
runPlayModeTestAsEditModeTest: 0
|
||||
actionOnDotNetUnhandledException: 1
|
||||
|
|
@ -526,12 +535,16 @@ PlayerSettings:
|
|||
cameraUsageDescription:
|
||||
locationUsageDescription:
|
||||
microphoneUsageDescription:
|
||||
bluetoothUsageDescription:
|
||||
switchNMETAOverride:
|
||||
switchNetLibKey:
|
||||
switchSocketMemoryPoolSize: 6144
|
||||
switchSocketAllocatorPoolSize: 128
|
||||
switchSocketConcurrencyLimit: 14
|
||||
switchScreenResolutionBehavior: 2
|
||||
switchUseCPUProfiler: 0
|
||||
switchUseGOLDLinker: 0
|
||||
switchLTOSetting: 0
|
||||
switchApplicationID: 0x01004b9000490000
|
||||
switchNSODependencies:
|
||||
switchTitleNames_0:
|
||||
|
|
@ -549,6 +562,7 @@ PlayerSettings:
|
|||
switchTitleNames_12:
|
||||
switchTitleNames_13:
|
||||
switchTitleNames_14:
|
||||
switchTitleNames_15:
|
||||
switchPublisherNames_0:
|
||||
switchPublisherNames_1:
|
||||
switchPublisherNames_2:
|
||||
|
|
@ -564,6 +578,7 @@ PlayerSettings:
|
|||
switchPublisherNames_12:
|
||||
switchPublisherNames_13:
|
||||
switchPublisherNames_14:
|
||||
switchPublisherNames_15:
|
||||
switchIcons_0: {fileID: 0}
|
||||
switchIcons_1: {fileID: 0}
|
||||
switchIcons_2: {fileID: 0}
|
||||
|
|
@ -579,6 +594,7 @@ PlayerSettings:
|
|||
switchIcons_12: {fileID: 0}
|
||||
switchIcons_13: {fileID: 0}
|
||||
switchIcons_14: {fileID: 0}
|
||||
switchIcons_15: {fileID: 0}
|
||||
switchSmallIcons_0: {fileID: 0}
|
||||
switchSmallIcons_1: {fileID: 0}
|
||||
switchSmallIcons_2: {fileID: 0}
|
||||
|
|
@ -594,6 +610,7 @@ PlayerSettings:
|
|||
switchSmallIcons_12: {fileID: 0}
|
||||
switchSmallIcons_13: {fileID: 0}
|
||||
switchSmallIcons_14: {fileID: 0}
|
||||
switchSmallIcons_15: {fileID: 0}
|
||||
switchManualHTML:
|
||||
switchAccessibleURLs:
|
||||
switchLegalInformation:
|
||||
|
|
@ -656,6 +673,11 @@ PlayerSettings:
|
|||
switchSocketInitializeEnabled: 1
|
||||
switchNetworkInterfaceManagerInitializeEnabled: 1
|
||||
switchPlayerConnectionEnabled: 1
|
||||
switchUseNewStyleFilepaths: 0
|
||||
switchUseMicroSleepForYield: 1
|
||||
switchEnableRamDiskSupport: 0
|
||||
switchMicroSleepForYieldTime: 25
|
||||
switchRamDiskSpaceSize: 12
|
||||
ps4NPAgeRating: 12
|
||||
ps4NPTitleSecret:
|
||||
ps4NPTrophyPackPath:
|
||||
|
|
@ -746,22 +768,27 @@ PlayerSettings:
|
|||
webGLAnalyzeBuildSize: 0
|
||||
webGLUseEmbeddedResources: 0
|
||||
webGLCompressionFormat: 1
|
||||
webGLWasmArithmeticExceptions: 0
|
||||
webGLLinkerTarget: 1
|
||||
webGLThreadsSupport: 0
|
||||
webGLWasmStreaming: 0
|
||||
webGLDecompressionFallback: 0
|
||||
scriptingDefineSymbols:
|
||||
1: TextMeshPro
|
||||
4: gameanalytics_ironsource_enabled;TextMeshPro;DREAMTECK_SPLINES
|
||||
7: gameanalytics_ironsource_enabled;TextMeshPro
|
||||
13: TextMeshPro
|
||||
14: TextMeshPro
|
||||
19: TextMeshPro
|
||||
21: TextMeshPro
|
||||
25: TextMeshPro
|
||||
27: TextMeshPro
|
||||
28: TextMeshPro
|
||||
29: TextMeshPro
|
||||
30: TextMeshPro
|
||||
Android: gameanalytics_ironsource_enabled;TextMeshPro
|
||||
CloudRendering: TextMeshPro
|
||||
EmbeddedLinux: TextMeshPro
|
||||
GameCoreXboxOne: TextMeshPro
|
||||
Lumin: TextMeshPro
|
||||
Nintendo Switch: TextMeshPro
|
||||
PS4: TextMeshPro
|
||||
PS5: TextMeshPro
|
||||
Stadia: TextMeshPro
|
||||
Standalone: TextMeshPro
|
||||
WebGL: TextMeshPro
|
||||
Windows Store Apps: TextMeshPro
|
||||
XboxOne: TextMeshPro
|
||||
iPhone: gameanalytics_ironsource_enabled;TextMeshPro;DREAMTECK_SPLINES
|
||||
tvOS: TextMeshPro
|
||||
additionalCompilerArguments: {}
|
||||
platformArchitecture:
|
||||
iPhone: 1
|
||||
scriptingBackend:
|
||||
|
|
@ -769,7 +796,10 @@ PlayerSettings:
|
|||
il2cppCompilerConfiguration: {}
|
||||
managedStrippingLevel: {}
|
||||
incrementalIl2cppBuild: {}
|
||||
suppressCommonWarnings: 1
|
||||
allowUnsafeCode: 0
|
||||
useDeterministicCompilation: 1
|
||||
enableRoslynAnalyzers: 1
|
||||
additionalIl2CppArgs:
|
||||
scriptingRuntimeVersion: 1
|
||||
gcIncremental: 0
|
||||
|
|
@ -805,6 +835,7 @@ PlayerSettings:
|
|||
metroFTAName:
|
||||
metroFTAFileTypes: []
|
||||
metroProtocolName:
|
||||
vcxProjDefaultLanguage:
|
||||
XboxOneProductId:
|
||||
XboxOneUpdateKey:
|
||||
XboxOneSandboxId:
|
||||
|
|
@ -832,10 +863,7 @@ PlayerSettings:
|
|||
XboxOneXTitleMemory: 8
|
||||
XboxOneOverrideIdentityName:
|
||||
XboxOneOverrideIdentityPublisher:
|
||||
vrEditorSettings:
|
||||
daydream:
|
||||
daydreamIconForeground: {fileID: 0}
|
||||
daydreamIconBackground: {fileID: 0}
|
||||
vrEditorSettings: {}
|
||||
cloudServicesEnabled:
|
||||
Build: 1
|
||||
UNet: 1
|
||||
|
|
@ -851,11 +879,14 @@ PlayerSettings:
|
|||
m_VersionCode: 1
|
||||
m_VersionName:
|
||||
apiCompatibilityLevel: 6
|
||||
activeInputHandler: 0
|
||||
cloudProjectId: b87bd54b-5da9-4aa2-806b-50a06c18d901
|
||||
framebufferDepthMemorylessMode: 0
|
||||
qualitySettingsNames: []
|
||||
projectName: popcorn
|
||||
organizationId: usayacoltd
|
||||
cloudEnabled: 0
|
||||
enableNativePlatformBackendsForNewInputSystem: 0
|
||||
disableOldInputManagerSupport: 0
|
||||
legacyClampBlendShapeWeights: 0
|
||||
playerDataPath:
|
||||
forceSRGBBlit: 1
|
||||
virtualTexturingSupportEnabled: 0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
m_EditorVersion: 2019.4.19f1
|
||||
m_EditorVersionWithRevision: 2019.4.19f1 (ca5b14067cec)
|
||||
m_EditorVersion: 2021.3.3f1
|
||||
m_EditorVersionWithRevision: 2021.3.3f1 (af2e63e8f9bd)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,167 @@
|
|||
{
|
||||
"templatePinStates": [],
|
||||
"dependencyTypeInfos": [
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.AnimationClip",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEditor.Animations.AnimatorController",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.AnimatorOverrideController",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEditor.Audio.AudioMixerController",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.ComputeShader",
|
||||
"ignore": true,
|
||||
"defaultInstantiationMode": 1,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Cubemap",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.GameObject",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEditor.LightingDataAsset",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": false
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.LightingSettings",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Material",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEditor.MonoScript",
|
||||
"ignore": true,
|
||||
"defaultInstantiationMode": 1,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.PhysicMaterial",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.PhysicsMaterial2D",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Rendering.VolumeProfile",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEditor.SceneAsset",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": false
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Shader",
|
||||
"ignore": true,
|
||||
"defaultInstantiationMode": 1,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.ShaderVariantCollection",
|
||||
"ignore": true,
|
||||
"defaultInstantiationMode": 1,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Texture",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Texture2D",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
},
|
||||
{
|
||||
"userAdded": false,
|
||||
"type": "UnityEngine.Timeline.TimelineAsset",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 0,
|
||||
"supportsModification": true
|
||||
}
|
||||
],
|
||||
"defaultDependencyTypeInfo": {
|
||||
"userAdded": false,
|
||||
"type": "<default_scene_template_dependencies>",
|
||||
"ignore": false,
|
||||
"defaultInstantiationMode": 1,
|
||||
"supportsModification": true
|
||||
},
|
||||
"newSceneOverride": 0
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!890905787 &1
|
||||
VersionControlSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Mode: Visible Meta Files
|
||||
m_CollabEditorSettings:
|
||||
inProgressEnabled: 1
|
||||
Loading…
Reference in New Issue