diff --git a/Assets/Resources/Games/tunnel.prefab b/Assets/Resources/Games/tunnel.prefab index be85e869..5ae34f5a 100644 --- a/Assets/Resources/Games/tunnel.prefab +++ b/Assets/Resources/Games/tunnel.prefab @@ -114,7 +114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8034898466080482128} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &695466435713197560 SpriteRenderer: @@ -574,90 +574,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1246933376798675597 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1776695555037247447} - - component: {fileID: 6254244258091243498} - m_Layer: 0 - m_Name: oceanTEMP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1776695555037247447 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1246933376798675597} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.31, y: 3.98, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8034898466080482128} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6254244258091243498 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1246933376798675597} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -10 - m_Sprite: {fileID: 679429674, guid: e5989d86fbc583249b719e00e74dd7d0, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 23.69, y: 10.93} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1292104832716346988 GameObject: m_ObjectHideFlags: 0 @@ -950,9 +866,7 @@ Transform: - {fileID: 4765218968776603078} - {fileID: 4219682866485472785} - {fileID: 4895754031794878509} - - {fileID: 4918668252672988523} - {fileID: 1875766407715100784} - - {fileID: 1776695555037247447} - {fileID: 3538292895231490712} - {fileID: 5133642571578142394} m_Father: {fileID: 0} @@ -1629,90 +1543,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3578182420739630913 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4918668252672988523} - - component: {fileID: 4883262556878791674} - m_Layer: 0 - m_Name: ref1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4918668252672988523 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3578182420739630913} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.7671, y: 0.2228, z: 0} - m_LocalScale: {x: 0.9207181, y: 0.9207181, z: 0.9207181} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8034898466080482128} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4883262556878791674 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3578182420739630913} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 100 - m_Sprite: {fileID: 21300000, guid: 89eb57dd129f4c54ebe2442632268e48, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.6313726} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.68, y: 10.24} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3865629320607136583 GameObject: m_ObjectHideFlags: 0 @@ -2344,7 +2174,7 @@ Transform: - {fileID: 5536934976388888783} - {fileID: 1116925177385483315} m_Father: {fileID: 8034898466080482128} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &1154286664300815188 SortingGroup: @@ -2659,7 +2489,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8034898466080482128} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8833910462996526567 GameObject: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry1.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry1.anim.meta index 29d1eef8..d9192b2c 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry1.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry1.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry2.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry2.anim.meta index 27cbd41a..f50de67a 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry2.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Angry2.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Arms_Idle.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Arms_Idle.anim.meta index 7f704fec..f4921d09 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Arms_Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Arms_Idle.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Cowbell.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Cowbell.controller.meta index 30ca9804..6d2d5dfb 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Cowbell.controller.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Cowbell.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Disturbed.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Disturbed.anim.meta index af5363c5..d2c41b01 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Disturbed.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Disturbed.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver.controller.meta index 3468fded..90358bb7 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver.controller.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver_Arms.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver_Arms.controller.meta index 3abcdf8f..b8b494be 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver_Arms.controller.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Driver_Arms.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle.anim.meta index 2029dcbd..614a5302 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle2.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle2.anim.meta index 9666453d..46a9fc33 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle2.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Idle2.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Animations/Shake.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Animations/Shake.anim.meta index 3f73fb4c..242904db 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Animations/Shake.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Animations/Shake.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation.meta index 89b1ef6f..eec38d72 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta index fa0ab927..fc5cc21d 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BG.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Beach.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Beach.anim.meta index c303b65d..1f44fe0f 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Beach.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/Beach.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachFar.anim.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachFar.anim.meta index fb182395..6efc86c9 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachFar.anim.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/Animation/BeachFar.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_beach_assets.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_beach_assets.png.meta index f94a580c..0e0ef9be 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_beach_assets.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_beach_assets.png.meta @@ -318,5 +318,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_backbuildings.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_backbuildings.png.meta index 491f91b6..c48d57f0 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_backbuildings.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_backbuildings.png.meta @@ -207,5 +207,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_frontbuildings.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_frontbuildings.png.meta index 5f6c97f0..6d2fe229 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_frontbuildings.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_city_frontbuildings.png.meta @@ -383,5 +383,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_dunes.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_dunes.png.meta index fabf57b3..e488e349 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_dunes.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_dunes.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_sky.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_sky.png.meta index 77dc3b46..4a8d4710 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_sky.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_desert_sky.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_farmer_assets.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_farmer_assets.png.meta index 7e67e02f..9c0cb38d 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_farmer_assets.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_farmer_assets.png.meta @@ -295,5 +295,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_grass.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_grass.png.meta index eb53e062..760cb821 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_grass.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_grass.png.meta @@ -185,5 +185,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_misc.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_misc.png.meta index 74640d43..7dc99e5a 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_misc.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_field_misc.png.meta @@ -215,5 +215,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_grass.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_grass.png.meta index 03e2626c..150c0e46 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_grass.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_grass.png.meta @@ -185,5 +185,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_misc.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_misc.png.meta index 8f62dc10..4f357277 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_misc.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_moai_misc.png.meta @@ -317,5 +317,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_aurora.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_aurora.png.meta index 86bdb4b2..0a8a75b0 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_aurora.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_aurora.png.meta @@ -163,5 +163,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_closeupstars.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_closeupstars.png.meta index 04a76364..b3e2e8e3 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_closeupstars.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_closeupstars.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_farawaystars.png.meta b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_farawaystars.png.meta index d76d4484..fdcc8e75 100644 --- a/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_farawaystars.png.meta +++ b/Assets/Resources/Sprites/Games/Tunnel/Backgrounds/tunnel_night_farawaystars.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrtunnel/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png b/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png deleted file mode 100644 index 4d62f868..00000000 Binary files a/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png.meta b/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png.meta deleted file mode 100644 index 44594b39..00000000 --- a/Assets/Resources/Sprites/Games/Tunnel/oceanTEMP.png.meta +++ /dev/null @@ -1,167 +0,0 @@ -fileFormatVersion: 2 -guid: e5989d86fbc583249b719e00e74dd7d0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 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: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 94.144226 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: oceanTEMP_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 2369 - height: 1093 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a8f0c98e0993fb24dbd550b314660867 - internalID: 679429674 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: oceanTEMP_1 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 2369 - height: 343 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c384be5c9dfc8534f934448b6e1e4aec - internalID: -604265584 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - oceanTEMP_0: 679429674 - oceanTEMP_1: -604265584 - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: ntrtunnel/common - assetBundleVariant: diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs index f2950c80..0f0eb11b 100644 --- a/Assets/Scripts/AppInfo.cs +++ b/Assets/Scripts/AppInfo.cs @@ -2,7 +2,7 @@ using System; public static class AppInfo { public const string Version = "0.0.1018"; - public static readonly DateTime Date = new DateTime(2023, 12, 21, 03, 53, 15, 934, DateTimeKind.Utc); + public static readonly DateTime Date = new DateTime(2024, 01, 15, 19, 39, 36, 317, DateTimeKind.Utc); } @@ -56,7 +56,9 @@ public class BuildNumberUpdater : UnityEditor.Build.IPreprocessBuild int.TryParse(bundleVersionSplit[1], out minor); if (bundleVersionSplit.Length >= 3) int.TryParse(bundleVersionSplit[2], out subVersion); +#if !HEAVENSTUDIO_PROD ++subVersion; +#endif string version = string.Format("{0}.{1}.{2}", major, minor, subVersion); var bundleVersionCode = (major * 100000) + (minor * 1000) + subVersion; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 121d8858..64830b86 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.0.1017 + bundleVersion: 1.0.0 preloadedAssets: - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3} metroInputSource: 0 @@ -158,11 +158,11 @@ PlayerSettings: applicationIdentifier: Standalone: com.RHeavenStudio.Heaven-Studio buildNumber: - Standalone: 1017 + Standalone: 1018 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 1017 + AndroidBundleVersionCode: 1018 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -684,7 +684,7 @@ PlayerSettings: PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 - Standalone: UNITY_POST_PROCESSING_STACK_V2 + Standalone: UNITY_POST_PROCESSING_STACK_V2;HEAVENSTUDIO_PROD WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2