Compare commits
2 Commits
3a7b1fb336
...
4df1f6522f
Author | SHA1 | Date | |
---|---|---|---|
|
4df1f6522f | ||
|
1cfacdadb5 |
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -10,6 +10,7 @@
|
|||
/[Bb]uilds/
|
||||
/[Ll]ogs/
|
||||
/[Uu]ser[Ss]ettings/
|
||||
/TableData/
|
||||
|
||||
# MemoryCaptures can get excessive in size.
|
||||
# They also could contain extremely sensitive data
|
||||
|
|
|
@ -15,7 +15,7 @@ MonoBehaviour:
|
|||
m_DefaultGroup: 82df392e77dbd5f469fa32631b9abc88
|
||||
m_currentHash:
|
||||
serializedVersion: 2
|
||||
Hash: c3e3a7538d4c35fad570cfbbd3b0a4c8
|
||||
Hash: a2b488a4198daa29f752b61cbbfa7fb0
|
||||
m_OptimizeCatalogSize: 0
|
||||
m_BuildRemoteCatalog: 0
|
||||
m_BundleLocalCatalog: 0
|
||||
|
@ -48,6 +48,7 @@ MonoBehaviour:
|
|||
- {fileID: 11400000, guid: d84da743a3c639c4c902b7ac816bd9e1, type: 2}
|
||||
- {fileID: 11400000, guid: 62f7d9fb3cd8ef849b8758e1cff24b01, type: 2}
|
||||
- {fileID: 11400000, guid: 064a216339ebac943a907bb759262055, type: 2}
|
||||
- {fileID: 11400000, guid: 554833193bb1f8c4e8d9df9d3c0e77be, type: 2}
|
||||
m_BuildSettings:
|
||||
m_CompileScriptsInVirtualMode: 0
|
||||
m_CleanupStreamingAssetsAfterBuilds: 1
|
||||
|
|
|
@ -17,8 +17,23 @@ MonoBehaviour:
|
|||
m_SerializedData: []
|
||||
m_GUID: e712bdead5849fb4f9c49d391a69adf3
|
||||
m_SerializeEntries:
|
||||
- m_GUID: 5087b46469b0aca4bb835138d6576399
|
||||
m_Address: Assets/AssetBundleResources/Characters
|
||||
- m_GUID: 00e97690e9831f84e85295dd8972cd3e
|
||||
m_Address: Player_Cop
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: e96f518301af6cb408c911f8d96c1215
|
||||
m_Address: Player_Cowboy
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 13c3758736541e44a8e863745f5b125f
|
||||
m_Address: Player_Female01
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 0f172b21f80f7244987e730fec11a12f
|
||||
m_Address: Player_Female02
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
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: e5d17a21594effb4e9591490b009e7aa, type: 3}
|
||||
m_Name: Tables_BundledAssetGroupSchema
|
||||
m_EditorClassIdentifier:
|
||||
m_Group: {fileID: 11400000, guid: 554833193bb1f8c4e8d9df9d3c0e77be, type: 2}
|
||||
m_InternalBundleIdMode: 1
|
||||
m_Compression: 1
|
||||
m_IncludeAddressInCatalog: 1
|
||||
m_IncludeGUIDInCatalog: 1
|
||||
m_IncludeLabelsInCatalog: 1
|
||||
m_InternalIdNamingMode: 0
|
||||
m_CacheClearBehavior: 0
|
||||
m_IncludeInBuild: 1
|
||||
m_BundledAssetProviderType:
|
||||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
|
||||
m_ForceUniqueProvider: 0
|
||||
m_UseAssetBundleCache: 1
|
||||
m_UseAssetBundleCrc: 1
|
||||
m_UseAssetBundleCrcForCachedBundles: 1
|
||||
m_UseUWRForLocalBundles: 0
|
||||
m_Timeout: 0
|
||||
m_ChunkedTransfer: 0
|
||||
m_RedirectLimit: -1
|
||||
m_RetryCount: 0
|
||||
m_BuildPath:
|
||||
m_Id: de2e16ecd7698af4e84e72931f476eda
|
||||
m_LoadPath:
|
||||
m_Id: 6cb2179ceb683ed458bb08f11dc763be
|
||||
m_BundleMode: 0
|
||||
m_AssetBundleProviderType:
|
||||
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
|
||||
m_BundleNaming: 0
|
||||
m_AssetLoadMode: 0
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c254fb39975ee3e49b93c9beb5c9c0f2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,16 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
|
||||
m_Name: Tables_ContentUpdateGroupSchema
|
||||
m_EditorClassIdentifier:
|
||||
m_Group: {fileID: 11400000, guid: 554833193bb1f8c4e8d9df9d3c0e77be, type: 2}
|
||||
m_StaticContent: 0
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 25ce0ca32538e21499b205ebe4689a51
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
30
Assets/AddressableAssetsData/AssetGroups/Tables.asset
Normal file
30
Assets/AddressableAssetsData/AssetGroups/Tables.asset
Normal file
|
@ -0,0 +1,30 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
|
||||
m_Name: Tables
|
||||
m_EditorClassIdentifier:
|
||||
m_GroupName: Tables
|
||||
m_Data:
|
||||
m_SerializedData: []
|
||||
m_GUID: 4855deeddf1257e449608c5a8e0e9c97
|
||||
m_SerializeEntries:
|
||||
- m_GUID: b41a7544effc36244a6deb15f55889be
|
||||
m_Address: JPropInfo
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
m_ReadOnly: 0
|
||||
m_Settings: {fileID: 11400000, guid: a27fd004fb823a34a9ae690bdbfd496e, type: 2}
|
||||
m_SchemaSet:
|
||||
m_Schemas:
|
||||
- {fileID: 11400000, guid: c254fb39975ee3e49b93c9beb5c9c0f2, type: 2}
|
||||
- {fileID: 11400000, guid: 25ce0ca32538e21499b205ebe4689a51, type: 2}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 554833193bb1f8c4e8d9df9d3c0e77be
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
8
Assets/AddressableResources.meta
Normal file
8
Assets/AddressableResources.meta
Normal file
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8ea9a1164bcc6a84994193f2ccd487e9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -538,6 +538,7 @@ GameObject:
|
|||
- component: {fileID: 2140123478648627397}
|
||||
- component: {fileID: 1319893631350053148}
|
||||
- component: {fileID: 3029072877129923665}
|
||||
- component: {fileID: 8567422993077356588}
|
||||
m_Layer: 0
|
||||
m_Name: Player_Cop
|
||||
m_TagString: Untagged
|
||||
|
@ -574,6 +575,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -614,3 +616,26 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_playerObj: {fileID: 9185467096088431885}
|
||||
_characterController: {fileID: 1319893631350053148}
|
||||
--- !u!136 &8567422993077356588
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 1, z: 0}
|
|
@ -538,6 +538,7 @@ GameObject:
|
|||
- component: {fileID: 2140123478648627397}
|
||||
- component: {fileID: 1319893631350053148}
|
||||
- component: {fileID: 3029072877129923665}
|
||||
- component: {fileID: 5948098750537304418}
|
||||
m_Layer: 0
|
||||
m_Name: Player_Cowboy
|
||||
m_TagString: Untagged
|
||||
|
@ -574,6 +575,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -614,3 +616,26 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_playerObj: {fileID: 9185467096088431885}
|
||||
_characterController: {fileID: 1319893631350053148}
|
||||
--- !u!136 &5948098750537304418
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 1, z: 0}
|
|
@ -538,6 +538,7 @@ GameObject:
|
|||
- component: {fileID: 2140123478648627397}
|
||||
- component: {fileID: 1319893631350053148}
|
||||
- component: {fileID: 3029072877129923665}
|
||||
- component: {fileID: 4558750650324747419}
|
||||
m_Layer: 0
|
||||
m_Name: Player_Female01
|
||||
m_TagString: Untagged
|
||||
|
@ -574,6 +575,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -614,3 +616,26 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_playerObj: {fileID: 9185467096088431885}
|
||||
_characterController: {fileID: 1319893631350053148}
|
||||
--- !u!136 &4558750650324747419
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 1, z: 0}
|
|
@ -538,6 +538,7 @@ GameObject:
|
|||
- component: {fileID: 2140123478648627397}
|
||||
- component: {fileID: 1319893631350053148}
|
||||
- component: {fileID: 3029072877129923665}
|
||||
- component: {fileID: 7283136279876262611}
|
||||
m_Layer: 0
|
||||
m_Name: Player_Female02
|
||||
m_TagString: Untagged
|
||||
|
@ -574,6 +575,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_minigameController: {fileID: 2780159524716559223}
|
||||
_characterRenderer: {fileID: 9161262214850749213}
|
||||
--- !u!143 &1319893631350053148
|
||||
CharacterController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -614,3 +616,26 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_playerObj: {fileID: 9185467096088431885}
|
||||
_characterController: {fileID: 1319893631350053148}
|
||||
--- !u!136 &7283136279876262611
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9215673432559229180}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 1, z: 0}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user