diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta b/Assets/Data/ModifierCatalog/Behaviors.meta similarity index 52% rename from Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta rename to Assets/Data/ModifierCatalog/Behaviors.meta index 4220f67..8e08e12 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta +++ b/Assets/Data/ModifierCatalog/Behaviors.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 153b1bc291f95524f8b60fe29792b97d -NativeFormatImporter: +guid: 283e40825d437754583f3c2c65c4072b +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset b/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset similarity index 63% rename from Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset rename to Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset index a184cf8..1f2c27a 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset +++ b/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset @@ -9,8 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 1 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 + m_Script: {fileID: 11500000, guid: 7e2fda372e0798647a33c50ce0e03bba, type: 3} + m_Name: NewBehavior + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Definition.ModifierBehavior + k__BackingField: 0 + conditions: [] + effects: [] diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta b/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta similarity index 79% rename from Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta rename to Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta index 6c29673..548db84 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta +++ b/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 810be46ce0245ca489f2aa9002b5df65 +guid: f8ca6f8dc19e3954da472597022ad937 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset deleted file mode 100644 index 9f6296c..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 2 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta deleted file mode 100644 index 621e38c..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 53b3975adc72ffa429fd60a33ae3aabf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset deleted file mode 100644 index 3761507..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 3 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset deleted file mode 100644 index 5261fc7..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 4 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset deleted file mode 100644 index d2fe92e..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 5 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta deleted file mode 100644 index ef9d71c..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 502d0fa3344e11e40aa810ac84dc037c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset deleted file mode 100644 index da3af8d..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: be178fd1aebd683499a1866da63c65fb, type: 3} - m_Name: DiceCountCondition 6 - m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition - targetValue: 0 - minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta deleted file mode 100644 index 168be58..0000000 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f454c289930e48f49904a0bc57768ad3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset b/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset new file mode 100644 index 0000000..0a7a83a --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset @@ -0,0 +1,25 @@ +%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: acb03445cebc5d842b34bc3e987ef174, type: 3} + m_Name: NewModifier + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Definition.ModifierDefinition + k__BackingField: + k__BackingField: + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1 + behaviors: [] diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta similarity index 79% rename from Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta rename to Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta index 170b830..b8e40b8 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta +++ b/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6077ab915ebb9e41871ebaed82fd5b5 +guid: a15c6a5e0f108684085e29cd9ac7447b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Textures/TEMP/yacht_placeholder.png b/Assets/Textures/TEMP/yacht_placeholder.png new file mode 100644 index 0000000..073a5c2 Binary files /dev/null and b/Assets/Textures/TEMP/yacht_placeholder.png differ diff --git a/Assets/Textures/TEMP/yacht_placeholder.png.meta b/Assets/Textures/TEMP/yacht_placeholder.png.meta new file mode 100644 index 0000000..de712ca --- /dev/null +++ b/Assets/Textures/TEMP/yacht_placeholder.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 8188071e2bba56c438a87b21f8d55641 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 115, y: 170, z: 131, w: 104} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: yacht_placeholder + rect: + serializedVersion: 2 + x: 138 + y: 235 + width: 745 + height: 668 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f5623932d69fd3e448a2bb36c09b26f3 + internalID: 862755894 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + yacht_placeholder: 862755894 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 6d685b4..b1cdadc 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "2.0.10", "com.unity.collab-proxy": "2.11.3", "com.unity.ide.rider": "3.0.39", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index eb29cdf..cae7b19 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -9,6 +9,12 @@ "com.unity.modules.unitywebrequest": "1.0.0" } }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.ai.navigation": { "version": "2.0.10", "depth": 0,