diff --git a/Assets/Resources/Games/octopusMachine.prefab.meta b/Assets/Resources/Games/octopusMachine.prefab.meta index 5cfb6da5c..faa63117e 100644 --- a/Assets/Resources/Games/octopusMachine.prefab.meta +++ b/Assets/Resources/Games/octopusMachine.prefab.meta @@ -3,5 +3,5 @@ guid: 1d194deb06e7c1b409e2eb3ed1b3be9c PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/Animations.meta b/Assets/Resources/Sprites/Games/OctopusMachine/Animations.meta index b9d40def4..bf018360d 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/Animations.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/Octopus.png.meta b/Assets/Resources/Sprites/Games/OctopusMachine/Octopus.png.meta index 448a14e41..71761e6d6 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/Octopus.png.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/Octopus.png.meta @@ -831,5 +831,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/octopus 1.mat.meta b/Assets/Resources/Sprites/Games/OctopusMachine/octopus 1.mat.meta index 232ae6f8b..c84098900 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/octopus 1.mat.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/octopus 1.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/octopus.mat.meta b/Assets/Resources/Sprites/Games/OctopusMachine/octopus.mat.meta index d402906af..cd569fa87 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/octopus.mat.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/octopus.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta b/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta index bdb624ab9..41fb44196 100644 --- a/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta +++ b/Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png.meta @@ -931,5 +931,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrcork/common assetBundleVariant: diff --git a/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs b/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs index c3f51d24a..82cf5ab7e 100644 --- a/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs +++ b/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs @@ -74,7 +74,11 @@ namespace HeavenStudio.Games.Loaders }, defaultLength = 0.5f, }, - }); + }, + new List() {"ntr", "repeat"}, + "ntrcork", "en", + new List() {} + ); } } } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index af0fbab80..59768a820 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 7a669c0db..e6eea13aa 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 3882391198 +CRC: 591327835 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -133,3 +133,6 @@ AssetBundleManifest: Info_42: Name: ntrshugyo/locale.en Dependencies: {} + Info_43: + Name: ntrcork/common + Dependencies: {} diff --git a/Assets/StreamingAssets/ntrcork.meta b/Assets/StreamingAssets/ntrcork.meta new file mode 100644 index 000000000..86811d901 --- /dev/null +++ b/Assets/StreamingAssets/ntrcork.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 011570a0cc2639a4b86977d4e28df4d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ntrcork/common b/Assets/StreamingAssets/ntrcork/common new file mode 100644 index 000000000..ed1636f47 Binary files /dev/null and b/Assets/StreamingAssets/ntrcork/common differ diff --git a/Assets/StreamingAssets/ntrcork/common.manifest b/Assets/StreamingAssets/ntrcork/common.manifest new file mode 100644 index 000000000..dc53e46e7 --- /dev/null +++ b/Assets/StreamingAssets/ntrcork/common.manifest @@ -0,0 +1,97 @@ +ManifestFileVersion: 0 +CRC: 209876665 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 84f9542fab0f84de812847b43d00a077 + TypeTreeHash: + serializedVersion: 2 + Hash: 7f563e7c714dfa22d5ef144e5d23c7a1 +HashAppended: 0 +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 23 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 91 + Script: {instanceID: 0} +- Class: 95 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 1958bfc64c2ec3f488a2010e690d7696, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 1817db01dd58406419f7d470f9af3187, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 212 + Script: {instanceID: 0} +- Class: 213 + Script: {instanceID: 0} +- Class: 222 + Script: {instanceID: 0} +- Class: 223 + Script: {instanceID: 0} +- Class: 224 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.FaceInfo_Legacy +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.FontAssetCreationSettings +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.KerningTable +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_Character +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_FontFeatureTable +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.TMP_FontWeightPair +- AssemblyName: Unity.TextMeshPro + ClassName: TMPro.VertexGradient +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.FaceInfo +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.Glyph +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.GlyphMetrics +- AssemblyName: UnityEngine.TextCoreFontEngineModule + ClassName: UnityEngine.TextCore.GlyphRect +- AssemblyName: UnityEngine.UI + ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent +Assets: +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Bop.anim +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Happy.anim +- Assets/Resources/Sprites/Games/OctopusMachine/octopus.mat +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/OctopusOld.controller +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Octopus.controller +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Idle.anim +- Assets/Resources/Sprites/Games/OctopusMachine/Octopus.png +- Assets/Resources/Sprites/Games/OctopusMachine/octopus_new.png +- Assets/Resources/Games/octopusMachine.prefab +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Prepare.anim +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Idle.anim +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Oops.anim +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Old/Angry.anim +- Assets/Resources/Sprites/Games/OctopusMachine/octopus 1.mat +- Assets/Resources/Sprites/Games/OctopusMachine/Animations/Bop.anim +Dependencies: [] diff --git a/Assets/StreamingAssets/ntrcork/common.manifest.meta b/Assets/StreamingAssets/ntrcork/common.manifest.meta new file mode 100644 index 000000000..370a0bd95 --- /dev/null +++ b/Assets/StreamingAssets/ntrcork/common.manifest.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef4a3e7e9becb1d4987dc538f75afc0b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ntrcork/common.meta b/Assets/StreamingAssets/ntrcork/common.meta new file mode 100644 index 000000000..452ce0574 --- /dev/null +++ b/Assets/StreamingAssets/ntrcork/common.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3de12e9aa2559e54d9ae7ebfa41d1783 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: