diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 44cf1881..53b558de 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -102,140 +102,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &229385509427098849 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7683902595720021875} - - component: {fileID: 6216482680056050970} - - component: {fileID: 6225043024655871366} - m_Layer: 0 - m_Name: NoriText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7683902595720021875 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229385509427098849} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 504328619051278505} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -7.375, y: -0.541667} - m_SizeDelta: {x: 1.25, y: 1.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6216482680056050970 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229385509427098849} - m_CullTransparentMesh: 1 ---- !u!114 &6225043024655871366 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 229385509427098849} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Flow - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 6d4610587e293f74ca2b71ec1cf59da3, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 0.5 - m_fontSizeBase: 0.5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -75 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0.25, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &320815790973455367 GameObject: m_ObjectHideFlags: 0 @@ -5349,6 +5215,7 @@ MonoBehaviour: - {fileID: 7256772822833254697} - {fileID: 3475821273632447422} - {fileID: 6493772388133163186} + BombGlowTint: {r: 0.8207547, g: 0.8207547, b: 0.1882353, a: 1} inCombo: 0 lockedInCombo: 0 comboWaiting: 0 @@ -31450,7 +31317,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504328619051278505} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1364957835243644098 SpriteRenderer: @@ -36797,7 +36664,7 @@ RectTransform: - {fileID: 5348445960594656213} - {fileID: 1719477137588232708} m_Father: {fileID: 504328619051278505} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -62266,7 +62133,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504328619051278505} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &117653910417391510 SpriteRenderer: @@ -67342,7 +67209,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7683902595720021875} - {fileID: 4602674661767132279} - {fileID: 2451790077583954414} - {fileID: 5398479681583471366} @@ -72285,7 +72151,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504328619051278505} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -97443,7 +97309,6 @@ MonoBehaviour: EligibleHits: [] scheduledInputs: [] firstEnable: 0 - IsComboEnable: 1 LightBulbColors: - {r: 0, g: 0, b: 0, a: 0} - {r: 0.23137255, g: 1, b: 1, a: 1} @@ -97473,13 +97338,9 @@ MonoBehaviour: NoriGO: {fileID: 4562470404778909465} Nori: {fileID: 3856490809560069226} MappingMaterial: {fileID: 2100000, guid: 01a12550d4a6d8141bbbdf4ce2700eea, type: 2} - BodyColor: {r: 1, g: 1, b: 1, a: 1} - HighlightColor: {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 1} - ItemColor: {r: 1, g: 1, b: 1, a: 1} Word: {fileID: 8471847813194768760} BGPlane: {fileID: 5423016352081307686} BGEffect: {fileID: 185016033042157469} - currentBgEffect: 0 BGGradient: {fileID: 2790469215453043610} BGBlood: {fileID: 5404947306895237780} BGRadial: {fileID: 8238140095837895901} diff --git a/Assets/Resources/Games/karateman.prefab.meta b/Assets/Resources/Games/karateman.prefab.meta index 81043080..3d197c6e 100644 --- a/Assets/Resources/Games/karateman.prefab.meta +++ b/Assets/Resources/Games/karateman.prefab.meta @@ -3,5 +3,5 @@ guid: d168b552a0cb2b44d8544bf0b6c8da13 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/alienHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/alienHit.ogg.meta index ed832a05..313f596c 100644 --- a/Assets/Resources/Sfx/games/karateman/alienHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/alienHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/barrelBreak.ogg.meta b/Assets/Resources/Sfx/games/karateman/barrelBreak.ogg.meta index c57b7ab2..9ce981d0 100644 --- a/Assets/Resources/Sfx/games/karateman/barrelBreak.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/barrelBreak.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg.meta b/Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg.meta index 8a36bea2..c86dc0f3 100644 --- a/Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg.meta b/Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg.meta index 16a05801..0c28edd1 100644 --- a/Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/bombBreak.ogg.meta b/Assets/Resources/Sfx/games/karateman/bombBreak.ogg.meta index 0922c012..ad9f482f 100644 --- a/Assets/Resources/Sfx/games/karateman/bombBreak.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/bombBreak.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/bombHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/bombHit.ogg.meta index e2a493d8..a19790a9 100644 --- a/Assets/Resources/Sfx/games/karateman/bombHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/bombHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/bombKick.ogg.meta b/Assets/Resources/Sfx/games/karateman/bombKick.ogg.meta index 0c2e040b..5cf31ee0 100644 --- a/Assets/Resources/Sfx/games/karateman/bombKick.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/bombKick.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/comboHit1.ogg.meta b/Assets/Resources/Sfx/games/karateman/comboHit1.ogg.meta index e2b04bf8..764d33e4 100644 --- a/Assets/Resources/Sfx/games/karateman/comboHit1.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/comboHit1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/comboHit2.ogg.meta b/Assets/Resources/Sfx/games/karateman/comboHit2.ogg.meta index 00046113..1f32ab5b 100644 --- a/Assets/Resources/Sfx/games/karateman/comboHit2.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/comboHit2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/comboHit3.ogg.meta b/Assets/Resources/Sfx/games/karateman/comboHit3.ogg.meta index 25516d47..e5da8b3a 100644 --- a/Assets/Resources/Sfx/games/karateman/comboHit3.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/comboHit3.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/comboHit4.ogg.meta b/Assets/Resources/Sfx/games/karateman/comboHit4.ogg.meta index 53689758..2f76d36e 100644 --- a/Assets/Resources/Sfx/games/karateman/comboHit4.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/comboHit4.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/comboMiss.ogg.meta b/Assets/Resources/Sfx/games/karateman/comboMiss.ogg.meta index 3859036f..3440954d 100644 --- a/Assets/Resources/Sfx/games/karateman/comboMiss.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/comboMiss.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/cookingPot.ogg.meta b/Assets/Resources/Sfx/games/karateman/cookingPot.ogg.meta index cf924179..776f8b9a 100644 --- a/Assets/Resources/Sfx/games/karateman/cookingPot.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/cookingPot.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/en.meta b/Assets/Resources/Sfx/games/karateman/en.meta new file mode 100644 index 00000000..08fbec9f --- /dev/null +++ b/Assets/Resources/Sfx/games/karateman/en.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78d7ac7d5cf1e0f40b3b81bc1e2c0700 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/four.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/four.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/four.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/four.ogg.meta index 51b8e500..f7f5f296 100644 --- a/Assets/Resources/Sfx/games/karateman/four.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/four.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/hit.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/hit.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/hit.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/hit.ogg.meta index 0ad8108a..acc0cbb0 100644 --- a/Assets/Resources/Sfx/games/karateman/hit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/hit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/hitAlt.wav.meta b/Assets/Resources/Sfx/games/karateman/en/hitAlt.wav.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/hitAlt.wav.meta rename to Assets/Resources/Sfx/games/karateman/en/hitAlt.wav.meta index 17a07dde..cac2739e 100644 --- a/Assets/Resources/Sfx/games/karateman/hitAlt.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/en/hitAlt.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/ko.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/ko.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/ko.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/ko.ogg.meta index dc6c9e99..723fb362 100644 --- a/Assets/Resources/Sfx/games/karateman/ko.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/ko.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/one.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/one.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/one.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/one.ogg.meta index 2294f3bd..7201a165 100644 --- a/Assets/Resources/Sfx/games/karateman/one.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/one.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/pow.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/pow.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/pow.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/pow.ogg.meta index c3eea43d..0b5ff3af 100644 --- a/Assets/Resources/Sfx/games/karateman/pow.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/pow.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchKick1.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchKick1.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchKick1.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchKick1.ogg.meta index 28d64bb4..0a0ccacb 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKick1.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchKick1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchKick2.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchKick2.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg.meta index 6a97819f..a5376dad 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKick2.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchKick3.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchKick3.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchKick3.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchKick3.ogg.meta index 2dab7d81..28b0a8cb 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKick3.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchKick3.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchKick4.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchKick4.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchKick4.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchKick4.ogg.meta index 25365c94..c721a763 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKick4.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchKick4.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchy1.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchy1.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchy1.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchy1.ogg.meta index ae5e5770..30d84be5 100644 --- a/Assets/Resources/Sfx/games/karateman/punchy1.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchy1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchy2.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchy2.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchy2.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchy2.ogg.meta index 50782c25..bd9852ea 100644 --- a/Assets/Resources/Sfx/games/karateman/punchy2.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchy2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchy3.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchy3.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchy3.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchy3.ogg.meta index 3f32d054..fcaf79f5 100644 --- a/Assets/Resources/Sfx/games/karateman/punchy3.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchy3.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/punchy4.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/punchy4.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/punchy4.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/punchy4.ogg.meta index 732af641..d6d59dee 100644 --- a/Assets/Resources/Sfx/games/karateman/punchy4.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/punchy4.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/three.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/three.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/three.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/three.ogg.meta index 3454db6c..4f9eb28f 100644 --- a/Assets/Resources/Sfx/games/karateman/three.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/three.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/threeAlt.wav.meta b/Assets/Resources/Sfx/games/karateman/en/threeAlt.wav.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/threeAlt.wav.meta rename to Assets/Resources/Sfx/games/karateman/en/threeAlt.wav.meta index 74db3588..0b5f94fa 100644 --- a/Assets/Resources/Sfx/games/karateman/threeAlt.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/en/threeAlt.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/two.ogg.meta b/Assets/Resources/Sfx/games/karateman/en/two.ogg.meta similarity index 87% rename from Assets/Resources/Sfx/games/karateman/two.ogg.meta rename to Assets/Resources/Sfx/games/karateman/en/two.ogg.meta index c3420d0b..56a9c4f2 100644 --- a/Assets/Resources/Sfx/games/karateman/two.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/en/two.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: karate/locale + assetBundleVariant: en diff --git a/Assets/Resources/Sfx/games/karateman/hitNoNori.wav.meta b/Assets/Resources/Sfx/games/karateman/hitNoNori.wav.meta index bacdff15..38527033 100644 --- a/Assets/Resources/Sfx/games/karateman/hitNoNori.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/hitNoNori.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/karate_through.wav.meta b/Assets/Resources/Sfx/games/karateman/karate_through.wav.meta index 100aa221..0f9f6836 100644 --- a/Assets/Resources/Sfx/games/karateman/karate_through.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/karate_through.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg.meta b/Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg.meta index 000301e8..c9041c58 100644 --- a/Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg.meta index 5a6395df..d5cc44cd 100644 --- a/Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg.meta b/Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg.meta index c35538e3..6e61ac94 100644 --- a/Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/nori_just.wav.meta b/Assets/Resources/Sfx/games/karateman/nori_just.wav.meta index 7ff43872..34b36cfc 100644 --- a/Assets/Resources/Sfx/games/karateman/nori_just.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/nori_just.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/nori_ng.wav.meta b/Assets/Resources/Sfx/games/karateman/nori_ng.wav.meta index 67a5de51..05730af6 100644 --- a/Assets/Resources/Sfx/games/karateman/nori_ng.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/nori_ng.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/nori_through.wav.meta b/Assets/Resources/Sfx/games/karateman/nori_through.wav.meta index 92b627db..99fcf6bd 100644 --- a/Assets/Resources/Sfx/games/karateman/nori_through.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/nori_through.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/objectOut.ogg.meta b/Assets/Resources/Sfx/games/karateman/objectOut.ogg.meta index 62d6d53f..17184097 100644 --- a/Assets/Resources/Sfx/games/karateman/objectOut.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/objectOut.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav.meta b/Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav.meta index 4a9ff2c4..84fe7f7a 100644 --- a/Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/offbeatObjectOut.ogg.meta b/Assets/Resources/Sfx/games/karateman/offbeatObjectOut.ogg.meta index 287c707f..2879dbbd 100644 --- a/Assets/Resources/Sfx/games/karateman/offbeatObjectOut.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/offbeatObjectOut.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/potHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/potHit.ogg.meta index de5fd434..4330ef80 100644 --- a/Assets/Resources/Sfx/games/karateman/potHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/potHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg.meta b/Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg.meta index f49b9a17..7bb73224 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg.meta b/Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg.meta index 9ceade9a..81bab687 100644 --- a/Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/rockHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/rockHit.ogg.meta index a99a89a9..d855a5c7 100644 --- a/Assets/Resources/Sfx/games/karateman/rockHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/rockHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/soccerHit.ogg.meta b/Assets/Resources/Sfx/games/karateman/soccerHit.ogg.meta index eda6a877..6915e352 100644 --- a/Assets/Resources/Sfx/games/karateman/soccerHit.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/soccerHit.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/swingKick.wav.meta b/Assets/Resources/Sfx/games/karateman/swingKick.wav.meta index a57fa206..309e82a7 100644 --- a/Assets/Resources/Sfx/games/karateman/swingKick.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/swingKick.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/swingNoHit.wav.meta b/Assets/Resources/Sfx/games/karateman/swingNoHit.wav.meta index 59fc0189..fcb3c3b4 100644 --- a/Assets/Resources/Sfx/games/karateman/swingNoHit.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/swingNoHit.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/swingNoHit_alt.wav.meta b/Assets/Resources/Sfx/games/karateman/swingNoHit_alt.wav.meta index f07cdee9..03e03006 100644 --- a/Assets/Resources/Sfx/games/karateman/swingNoHit_alt.wav.meta +++ b/Assets/Resources/Sfx/games/karateman/swingNoHit_alt.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateman/tacobell.ogg.meta b/Assets/Resources/Sfx/games/karateman/tacobell.ogg.meta index a9bd26c1..7f83df9a 100644 --- a/Assets/Resources/Sfx/games/karateman/tacobell.ogg.meta +++ b/Assets/Resources/Sfx/games/karateman/tacobell.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan.meta b/Assets/Resources/Sprites/Games/KarateMan.meta index 083a17b6..59bd00ba 100644 --- a/Assets/Resources/Sprites/Games/KarateMan.meta +++ b/Assets/Resources/Sprites/Games/KarateMan.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: karate/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat index 419d3c85..bf3237f7 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat @@ -82,8 +82,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.84705883, g: 0.8156863, b: 0.6901961, a: 1} - _ColorBravo: {r: 1, g: 0, b: 0, a: 1} - - _ColorDelta: {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 1} + - _ColorDelta: {r: 0.972549, g: 0.972549, b: 0.972549, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 64dceab2..ade9c268 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -66,13 +66,13 @@ namespace HeavenStudio.Games.Loaders }, inactiveFunction: delegate { var e = eventCaller.currentEntity; KarateMan.SetBgEffectsUnloaded(e.beat, e.length, e.type, e.type2, e.colorA, e.colorB, e.type3, e.type4, e.type5, e.colorC, e.colorD); } ), - new GameAction("set object colors", delegate { var e = eventCaller.currentEntity; KarateMan.instance.UpdateMaterialColour(e.colorA, e.colorB, e.colorC); }, 0.5f, false, new List() + new GameAction("set object colors", delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColour(e.colorA, e.colorB, e.colorC); }, 0.5f, false, new List() { new Param("colorA", new Color(), "Joe Body Color", "The color to use for Karate Joe's body"), new Param("colorB", new Color(), "Joe Highlight Color", "The color to use for Karate Joe's highlights"), new Param("colorC", new Color(), "Item Color", "The color to use for the thrown items"), }, - inactiveFunction: delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColourUnloaded(e.colorA, e.colorB, e.colorC); } + inactiveFunction: delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColour(e.colorA, e.colorB, e.colorC); } ), new GameAction("particle effects", delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetParticleEffect(e.beat, e.type, e.valA, e.valB); }, 0.5f, false, new List() { @@ -124,7 +124,11 @@ namespace HeavenStudio.Games.Loaders }, hidden: true), - }); + }, + new List() {"agb", "ntr", "rvl", "ctr", "pco", "normal"}, + "karate", "en", + new List() {"en"} + ); } } } @@ -247,7 +251,7 @@ namespace HeavenStudio.Games Vector3 cameraPosition; static float startCamSpecial = Single.MinValue; static float wantsReturn = Single.MinValue; - static float cameraReturnLength = 2f; + static float cameraReturnLength = 0f; static CameraAngle cameraAngle = CameraAngle.Normal; //pot trajectory stuff @@ -260,9 +264,9 @@ namespace HeavenStudio.Games [Header("Colour Map")] public Material MappingMaterial; - public static Color BodyColor; - public static Color HighlightColor; - public static Color ItemColor; + public static Color BodyColor = Color.white; + public static Color HighlightColor = Color.white; + public static Color ItemColor = Color.white; [Header("Word")] public Animator Word; @@ -846,15 +850,7 @@ namespace HeavenStudio.Games customShadowColour = colour; } - public void UpdateMaterialColour(Color mainCol, Color highlightCol, Color objectCol) - { - MappingMaterial.SetColor("_ColorAlpha", mainCol); - MappingMaterial.SetColor("_ColorBravo", new Color(1, 0, 0, 1)); - MappingMaterial.SetColor("_ColorDelta", highlightCol); - ItemColor = objectCol; - } - - public static void UpdateMaterialColourUnloaded(Color mainCol, Color highlightCol, Color objectCol) + public static void UpdateMaterialColour(Color mainCol, Color highlightCol, Color objectCol) { BodyColor = mainCol; HighlightColor = highlightCol; diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index 7596b758..36eb95fb 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -15,6 +15,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan public GameEvent bop = new GameEvent(); public SpriteRenderer[] Shadows; + public Color BombGlowTint; + float bombGlowStart = Single.MinValue; + float bombGlowLength = 0f; + float bombGlowIntensity; + const float bombGlowRatio = 1f; + float lastPunchTime = Single.MinValue; float lastComboMissTime = Single.MinValue; float lastUpperCutTime = Single.MinValue; @@ -48,6 +54,20 @@ namespace HeavenStudio.Games.Scripts_KarateMan { var cond = Conductor.instance; + if (cond.songPositionInBeats < bombGlowStart) + { + bombGlowIntensity = 1f; + } + else + { + float glowProg = cond.GetPositionFromBeat(bombGlowStart, bombGlowLength); + bombGlowIntensity = 1f - glowProg; + if (cond.songPositionInBeats >= bombGlowStart + bombGlowLength) + { + bombGlowStart = Single.MinValue; + bombGlowLength = 0f; + } + } UpdateShadowColour(); if (canEmote && wantFace >= 0) @@ -314,6 +334,19 @@ namespace HeavenStudio.Games.Scripts_KarateMan { shadow.color = KarateMan.instance.GetShadowColor(); } + + Color mainCol = KarateMan.BodyColor; + Color highlightCol = KarateMan.HighlightColor; + + if (bombGlowIntensity > 0) + { + highlightCol = Color.LerpUnclamped(highlightCol, mainCol, bombGlowIntensity); + mainCol += BombGlowTint * bombGlowIntensity * bombGlowRatio; + } + + KarateMan.instance.MappingMaterial.SetColor("_ColorAlpha", mainCol); + KarateMan.instance.MappingMaterial.SetColor("_ColorBravo", new Color(1, 0, 0, 1)); + KarateMan.instance.MappingMaterial.SetColor("_ColorDelta", highlightCol); } public void Prepare(float beat, float length) @@ -334,5 +367,19 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (canEmote || ignoreCheck) FaceAnim.DoScaledAnimationAsync("Face" + face.ToString("D2")); } + + public void ApplyBombGlow() + { + bombGlowStart = Single.MaxValue; + bombGlowLength = 0f; + bombGlowIntensity = 1f; + } + + public void RemoveBombGlow(float beat, float length = 0.5f) + { + bombGlowStart = beat; + bombGlowLength = length; + bombGlowIntensity = 0f; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index 2fb378b9..74d14a80 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -374,13 +374,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan { ParticleSystem p; CreateHitMark(type == ItemType.KickBomb); + KarateMan game = KarateMan.instance; switch (type) { case ItemType.Bulb: CurrentCurve = ItemCurves[straight ? 1 : 0]; curveTargetBeat = straight ? 1f : 1.5f;; Jukebox.PlayOneShotGame("karateman/lightbulbHit", forcePlay: true); - p = Instantiate(HitParticles[5], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[5], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); if (effectTint.a == 0) break; @@ -404,30 +405,30 @@ namespace HeavenStudio.Games.Scripts_KarateMan CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true); - p = Instantiate(HitParticles[4], HitPosition[1].position, Quaternion.identity, KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[4], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p.Play(); break; case ItemType.Ball: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/soccerHit", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.Cooking: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/cookingPot", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); - KarateMan.instance.CreateItemInstance(startBeat + 1f, "Item09", ItemType.CookingLid); + game.CreateItemInstance(startBeat + 1f, "Item09", ItemType.CookingLid); GetComponent().Play("Item08", -1, 0); break; case ItemType.Alien: CurrentCurve = ItemCurves[1]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/alienHit", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.TacoBell: @@ -435,69 +436,73 @@ namespace HeavenStudio.Games.Scripts_KarateMan curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true); Jukebox.PlayOneShotGame("karateman/tacobell", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot1: CurrentCurve = ItemCurves[straight ? 1 : 0]; curveTargetBeat = 1.5f; Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot2: CurrentCurve = ItemCurves[0]; curveTargetBeat = 1.5f; Jukebox.PlayOneShotGame("karateman/comboHit1", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot3: CurrentCurve = ItemCurves[2]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit2", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[2].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[2].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot4: CurrentCurve = ItemCurves[3]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[3].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[3].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboPot5: CurrentCurve = ItemCurves[4]; curveTargetBeat = 1f; Jukebox.PlayOneShotGame("karateman/comboHit3", forcePlay: true); - p = Instantiate(HitParticles[1], HitPosition[4].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[4].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.ComboBarrel: Jukebox.PlayOneShotGame("karateman/comboHit4", forcePlay: true); - p = Instantiate(HitParticles[0], HitPosition[5].position, Quaternion.identity, KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[0], HitPosition[5].position, Quaternion.identity, game.ItemHolder); p.Play(); - p = Instantiate(HitParticles[1], HitPosition[5].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[5].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); break; case ItemType.KickBarrel: - KarateMan.instance.CreateItemInstance(startBeat + 1f, "Item04", ItemType.KickBomb); + game.CreateItemInstance(startBeat + 1f, "Item04", ItemType.KickBomb); Jukebox.PlayOneShotGame("karateman/barrelBreak", forcePlay: true); - p = Instantiate(HitParticles[0], HitPosition[1].position, Quaternion.Euler(0, 0, -5f), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[0], HitPosition[1].position, Quaternion.Euler(0, 0, -5f), game.ItemHolder); p.Play(); - p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p.Play(); + + game.Joe.ApplyBombGlow(); break; case ItemType.KickBomb: Jukebox.PlayOneShotGame("karateman/bombKick", forcePlay: true); - p = Instantiate(HitParticles[2], ItemCurves[6].GetPoint(0.5f), Quaternion.identity, KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[2], ItemCurves[6].GetPoint(0.5f), Quaternion.identity, game.ItemHolder); p.Play(); + + game.Joe.RemoveBombGlow(startBeat + 0.75f); break; default: CurrentCurve = ItemCurves[straight ? 1 : 0]; curveTargetBeat = straight ? 1f : 1.5f; Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true); - p = Instantiate(HitParticles[3], HitPosition[1].position, Quaternion.identity, KarateMan.instance.ItemHolder); + p = Instantiate(HitParticles[3], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p.Play(); break; } @@ -947,6 +952,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan }); KarateMan.instance.Nori.DoNG(); + joe.RemoveBombGlow(startBeat + 0.75f); } else { ItemHitEffect(); @@ -988,6 +994,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan }); KarateMan.instance.Nori.DoThrough(); OnHit.CanHit(false); + KarateMan.instance.Joe.RemoveBombGlow(startBeat + 0.75f * 2, 1.5f); } } } \ No newline at end of file diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index bb147b2e..c6cdf3f6 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 028defae..d303ebea 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,9 +1,5 @@ ManifestFileVersion: 0 -<<<<<<< HEAD -CRC: 3049528508 -======= -CRC: 1137954711 ->>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f +CRC: 968963630 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -36,3 +32,9 @@ AssetBundleManifest: Info_9: Name: ntrdj/common Dependencies: {} + Info_10: + Name: karate/common + Dependencies: {} + Info_11: + Name: karate/locale.en + Dependencies: {} diff --git a/Assets/StreamingAssets/ctrpillow/common b/Assets/StreamingAssets/ctrpillow/common index de389622..a043eee0 100644 Binary files a/Assets/StreamingAssets/ctrpillow/common and b/Assets/StreamingAssets/ctrpillow/common differ diff --git a/Assets/StreamingAssets/ctrpillow/common.manifest b/Assets/StreamingAssets/ctrpillow/common.manifest index f01e9ce5..73c92e38 100644 --- a/Assets/StreamingAssets/ctrpillow/common.manifest +++ b/Assets/StreamingAssets/ctrpillow/common.manifest @@ -1,17 +1,9 @@ ManifestFileVersion: 0 -<<<<<<< HEAD -CRC: 2012087739 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 8b334bb89c2bd50abd515949ade25271 -======= CRC: 4200721013 Hashes: AssetFileHash: serializedVersion: 2 Hash: 996e27defaede200a0288a246ceb7785 ->>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f TypeTreeHash: serializedVersion: 2 Hash: 77ce82dcd01e7c9c803f77daf119d967 diff --git a/Assets/StreamingAssets/karate.meta b/Assets/StreamingAssets/karate.meta new file mode 100644 index 00000000..6f16e211 --- /dev/null +++ b/Assets/StreamingAssets/karate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25a1a22e2d30fb54597cabf4e4bcda3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common new file mode 100644 index 00000000..3206c17c Binary files /dev/null and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest new file mode 100644 index 00000000..d78bea9e --- /dev/null +++ b/Assets/StreamingAssets/karate/common.manifest @@ -0,0 +1,207 @@ +ManifestFileVersion: 0 +CRC: 3714046501 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: e2fd4741b223fcd4572680396471ffda + TypeTreeHash: + serializedVersion: 2 + Hash: 9911656494477f12e9bb85e9f15cac54 +HashAppended: 0 +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 43 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 83 + Script: {instanceID: 0} +- Class: 91 + Script: {instanceID: 0} +- Class: 95 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 3f1678e3fe1b7c94f9a1558cfd247853, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: e6ef00cb3bdcfd647bd634066ce4107d, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 9fe0aa75ca1a42347aea0b0b14b024a4, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: d73c427be556896499214ab4666ff3b3, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: af41fb607b88d8644b683298f8fcaf54, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 182 + Script: {instanceID: 0} +- Class: 198 + Script: {instanceID: 0} +- Class: 199 + Script: {instanceID: 0} +- Class: 210 + 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: Assembly-CSharp + ClassName: HeavenStudio.Games.Minigame/Eligible +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.RectOffset +- AssemblyName: UnityEngine.UI + ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent +Assets: +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png +- Assets/Resources/Sprites/Games/KarateMan/effect/krt_rock.mat +- Assets/Resources/Sprites/Games/KarateMan/effect/fire.png +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/ToReady.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/bg/NoPose.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/bg/BGeffect.controller +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item00.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item03.anim +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelWoodRecolorable.png +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item09.anim +- Assets/Resources/Sfx/games/karateman/nori_ng.wav +- Assets/Resources/Sprites/Games/KarateMan/effect/potStar.png +- Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png +- Assets/Resources/Sfx/games/karateman/swingKick.wav +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelWood.png +- Assets/Resources/Sfx/games/karateman/offbeatLightbulbOut.wav +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_1.png +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/JabNoNuri.anim +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_1.png +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/ManCharge.anim +- Assets/Resources/Sfx/games/karateman/tacobell.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim +- Assets/Resources/Sfx/games/karateman/swingNoHit_alt.wav +- Assets/Resources/Sprites/Games/KarateMan/karateman_word.png +- Assets/Resources/Sprites/Games/KarateMan/effect/krt_kick.mat +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable01.png +- Assets/Resources/Sfx/games/karateman/swingNoHit.wav +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face08.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face06.anim +- Assets/Resources/Sprites/Games/KarateMan/effect/krt_bombfire.mat +- Assets/Resources/Sprites/Games/KarateMan/effect/krt_bombimpact.mat +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/ManKick.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/item/ItemObject.controller +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/LowKick.anim +- Assets/Resources/Sfx/games/karateman/hitNoNori.wav +- Assets/Resources/Sfx/games/karateman/potHit.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/overlay/NoriFull.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/overlay/NoriNone.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/NoPose.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Jab.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face04.anim +- Assets/Resources/Sfx/games/karateman/rockHit.ogg +- Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Beat.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face03.anim +- Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_0.png +- Assets/Resources/Sprites/Games/KarateMan/anime/bg/Sunburst.anim +- Assets/Resources/Sfx/games/karateman/comboHit2.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/LowJab.anim +- Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png +- Assets/Resources/Sprites/Games/KarateMan/karateman_nonurijab.mat +- Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item08.anim +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_gradient.png +- Assets/Resources/Sprites/Games/KarateMan/effect/impact.png +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelParts00.png +- Assets/Resources/Sfx/games/karateman/bombBreak.ogg +- Assets/Resources/Sfx/games/karateman/barrelBreak.ogg +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelPartsRecolorable00.png +- Assets/Resources/Sprites/Games/KarateMan/effect/kickHit.png +- Assets/Resources/Games/karateman.prefab +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item05.anim +- Assets/Resources/Sfx/games/karateman/comboMiss.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item99.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face05.anim +- Assets/Resources/Sprites/Games/KarateMan/karate_overlaydeco00.png +- Assets/Resources/Sprites/Games/KarateMan/anime/word/NoPose.anim +- Assets/Resources/Sfx/games/karateman/comboHit1.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/LowKickMiss.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word05.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/overlay/NoriHeart.controller +- Assets/Resources/Sfx/games/karateman/karate_through.wav +- Assets/Resources/Sfx/games/karateman/bombHit.ogg +- Assets/Resources/Sprites/Games/KarateMan/karateman_main.png +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item07.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face02.anim +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_radial.png +- Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png +- Assets/Resources/Sprites/Games/KarateMan/karateman_norimapping.mat +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/UpperCut.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller +- Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg +- Assets/Resources/Sprites/Games/KarateMan/effect/krt_pot.mat +- Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim +- Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png +- Assets/Resources/Sfx/games/karateman/objectOut.ogg +- Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item04.anim +- Assets/Resources/Sfx/games/karateman/comboHit3.ogg +- Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png +- Assets/Resources/Sfx/games/karateman/cookingPot.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face01.anim +- Assets/Resources/Sprites/Games/KarateMan/karateman_overlays.png +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim +- Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg +- Assets/Resources/Sfx/games/karateman/bombKick.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim +- Assets/Resources/Sfx/games/karateman/alienHit.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/bg/Rings.anim +- Assets/Resources/Sfx/games/karateman/comboHit4.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/KarateManHead.controller +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item06.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/KarateMan.controller +- Assets/Resources/Sprites/Games/KarateMan/effect/barrelParts01.png +- Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg +- Assets/Resources/Sprites/Games/KarateMan/effect/other.png +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/BackHand.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Straight.anim +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face07.anim +- Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg +- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item02.anim +- Assets/Resources/Sfx/games/karateman/nori_through.wav +- Assets/Resources/Sfx/games/karateman/offbeatObjectOut.ogg +- Assets/Resources/Sfx/games/karateman/nori_just.wav +- Assets/Resources/Sfx/games/karateman/soccerHit.ogg +- Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png +- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face00.anim +Dependencies: [] diff --git a/Assets/StreamingAssets/karate/common.manifest.meta b/Assets/StreamingAssets/karate/common.manifest.meta new file mode 100644 index 00000000..a4117187 --- /dev/null +++ b/Assets/StreamingAssets/karate/common.manifest.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 63b5d27a59375994ba0eac8d8c710ac8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/karate/common.meta b/Assets/StreamingAssets/karate/common.meta new file mode 100644 index 00000000..efa9a03a --- /dev/null +++ b/Assets/StreamingAssets/karate/common.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c3556fd8c8a45a84cae3e2e32bf3b6c8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/karate/locale.en b/Assets/StreamingAssets/karate/locale.en new file mode 100644 index 00000000..1eb9625b Binary files /dev/null and b/Assets/StreamingAssets/karate/locale.en differ diff --git a/Assets/StreamingAssets/karate/locale.en.manifest b/Assets/StreamingAssets/karate/locale.en.manifest new file mode 100644 index 00000000..6198f8c2 --- /dev/null +++ b/Assets/StreamingAssets/karate/locale.en.manifest @@ -0,0 +1,33 @@ +ManifestFileVersion: 0 +CRC: 67804883 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 12b838a94c79042ad1655edbf842a8f6 + TypeTreeHash: + serializedVersion: 2 + Hash: 9a2ca7bdbd1871f7131daf57de908e0c +HashAppended: 0 +ClassTypes: +- Class: 83 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: [] +Assets: +- Assets/Resources/Sfx/games/karateman/punchKick4.ogg +- Assets/Resources/Sfx/games/karateman/one.ogg +- Assets/Resources/Sfx/games/karateman/punchy2.ogg +- Assets/Resources/Sfx/games/karateman/threeAlt.wav +- Assets/Resources/Sfx/games/karateman/hitAlt.wav +- Assets/Resources/Sfx/games/karateman/two.ogg +- Assets/Resources/Sfx/games/karateman/punchKick3.ogg +- Assets/Resources/Sfx/games/karateman/four.ogg +- Assets/Resources/Sfx/games/karateman/punchKick1.ogg +- Assets/Resources/Sfx/games/karateman/pow.ogg +- Assets/Resources/Sfx/games/karateman/punchy3.ogg +- Assets/Resources/Sfx/games/karateman/ko.ogg +- Assets/Resources/Sfx/games/karateman/punchy1.ogg +- Assets/Resources/Sfx/games/karateman/punchy4.ogg +- Assets/Resources/Sfx/games/karateman/hit.ogg +- Assets/Resources/Sfx/games/karateman/three.ogg +- Assets/Resources/Sfx/games/karateman/punchKick2.ogg +Dependencies: [] diff --git a/Assets/StreamingAssets/karate/locale.en.manifest.meta b/Assets/StreamingAssets/karate/locale.en.manifest.meta new file mode 100644 index 00000000..7dad6892 --- /dev/null +++ b/Assets/StreamingAssets/karate/locale.en.manifest.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc4cb03000a4f0545936d445509a5076 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/karate/locale.en.meta b/Assets/StreamingAssets/karate/locale.en.meta new file mode 100644 index 00000000..f0e6d9db --- /dev/null +++ b/Assets/StreamingAssets/karate/locale.en.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7c1b5f1337f6a3d48884ba3efb227555 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 11e0554c..09658cf4 100644 Binary files a/Assets/StreamingAssets/ntrdj/common and b/Assets/StreamingAssets/ntrdj/common differ diff --git a/Assets/StreamingAssets/ntrdj/common.manifest b/Assets/StreamingAssets/ntrdj/common.manifest index a225ec66..8b5667ac 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3294649116 +CRC: 1942609421 Hashes: AssetFileHash: serializedVersion: 2 - Hash: dd0c19304cf6445216469a6916c9e238 + Hash: 82fbc7ccb21aa83d8663117da7a24cbc TypeTreeHash: serializedVersion: 2 - Hash: 902c722d69f548f2a42d6263cb334ee9 + Hash: 558e305ab690efbcd3eff9455cc9f4dc HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 2cce869a..ce692347 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 33649265..5fa62182 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,20 +1,12 @@ ManifestFileVersion: 0 -<<<<<<< HEAD -CRC: 2010253220 +CRC: 848712941 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 3e555585e70be6acd65ba10c73ef4544 -======= -CRC: 47493552 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 277abe6be554c0a5a8b3115a4b8317aa ->>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f + Hash: 0ef2ef396a224bdafb47a87a3665071f TypeTreeHash: serializedVersion: 2 - Hash: d5bdda7523be8cdc2ec1df479dc7821d + Hash: 6f0c5ebd30d7d3be8aad1c86837b5cc9 HashAppended: 0 ClassTypes: - Class: 1