diff --git a/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png b/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png new file mode 100644 index 00000000..706633bb Binary files /dev/null and b/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png differ diff --git a/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png.meta b/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png.meta new file mode 100644 index 00000000..fa13f03c --- /dev/null +++ b/box1/Assets/Art/UI/TourPanel/1122b983fae6059c88a4bcb292b975c.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 1aeef76e1c722974eb5be6965de0a08e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png b/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png new file mode 100644 index 00000000..d64c1344 Binary files /dev/null and b/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png differ diff --git a/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png.meta b/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png.meta new file mode 100644 index 00000000..750df980 --- /dev/null +++ b/box1/Assets/Art/UI/TourPanel/bf99a3fc7422d724fc507136d4e57a5.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0e2f7f250df9ed04fa76c65caf6eb93c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/box1/Assets/Editor/StarkBuilderSetting.asset b/box1/Assets/Editor/StarkBuilderSetting.asset index 0eac46a3..3e8a01d4 100644 --- a/box1/Assets/Editor/StarkBuilderSetting.asset +++ b/box1/Assets/Editor/StarkBuilderSetting.asset @@ -44,7 +44,7 @@ MonoBehaviour: a: tt2f5a59e7b06fb35a07 version: autoVersion: 0 - b: E:\Project\apk\BoxDY\webgl_package-20241228_182428.zip + b: E:\Project\apk\BoxDY\webgl_package-20241230_140603.zip c: 0 d: 0 e: 0 diff --git a/box1/Assets/Prefab/TT/Canvas.prefab b/box1/Assets/Prefab/TT/Canvas.prefab index 63de3260..87ca9c02 100644 --- a/box1/Assets/Prefab/TT/Canvas.prefab +++ b/box1/Assets/Prefab/TT/Canvas.prefab @@ -951,6 +951,9 @@ MonoBehaviour: eventButton1: {fileID: 3838309414256967349} eventButton2: {fileID: 4960505906423506548} timeButton: {fileID: 4688882427578778920} + video: {fileID: 5474900672480377322} + time1: {fileID: 7980009432462645888} + time2: {fileID: 1948250166908864045} close: {fileID: 2429796358503295671} settingButton: {fileID: 6572810902699390605} audioButton: {fileID: 8750277471665442816} @@ -3246,85 +3249,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &508480109655984279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7253355387296583475} - - component: {fileID: 999678343180026420} - - component: {fileID: 4189099595249002627} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7253355387296583475 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508480109655984279} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8141764428346637989} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &999678343180026420 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508480109655984279} - m_CullTransparentMesh: 1 ---- !u!114 &4189099595249002627 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508480109655984279} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2198231395b4bc14eb6e7595452efc46, type: 3} - m_FontSize: 98 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 160 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: X3 Time --- !u!1 &520921606030734613 GameObject: m_ObjectHideFlags: 0 @@ -10799,6 +10723,85 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1903565562455954966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744315662777532470} + - component: {fileID: 1489896963078316993} + - component: {fileID: 5544763501632585822} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744315662777532470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903565562455954966} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3041739774096470170} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 64.8, y: -2.4239} + m_SizeDelta: {x: 74.5003, y: 53.9008} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1489896963078316993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903565562455954966} + m_CullTransparentMesh: 1 +--- !u!114 &5544763501632585822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903565562455954966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 2198231395b4bc14eb6e7595452efc46, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 5 + m_MaxSize: 55 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: x3 --- !u!1 &1906704013582715454 GameObject: m_ObjectHideFlags: 0 @@ -11157,6 +11160,81 @@ MonoBehaviour: icon: {fileID: 6256930093681505557} name: {fileID: 7390080189042656196} points: {fileID: 7993470970363825578} +--- !u!1 &1948250166908864045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8635846126638533461} + - component: {fileID: 9150942213909712681} + - component: {fileID: 495276335168312094} + m_Layer: 5 + m_Name: t1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8635846126638533461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948250166908864045} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8141764428346637989} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 138, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9150942213909712681 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948250166908864045} + m_CullTransparentMesh: 1 +--- !u!114 &495276335168312094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948250166908864045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 1aeef76e1c722974eb5be6965de0a08e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1960777690614850280 GameObject: m_ObjectHideFlags: 0 @@ -28178,6 +28256,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5474900672480377322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3041739774096470170} + - component: {fileID: 8348679209933480506} + - component: {fileID: 187076070897596120} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3041739774096470170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5474900672480377322} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 744315662777532470} + m_Father: {fileID: 8141764428346637989} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -37.1, y: -63.2} + m_SizeDelta: {x: 48.4532, y: 48.4532} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8348679209933480506 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5474900672480377322} + m_CullTransparentMesh: 1 +--- !u!114 &187076070897596120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5474900672480377322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 584eb13c1ac8c4c439b5bbd3f461614c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5497568787768770992 GameObject: m_ObjectHideFlags: 0 @@ -34628,13 +34782,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7253355387296583475} + - {fileID: 8155402598736379727} + - {fileID: 8635846126638533461} + - {fileID: 3041739774096470170} m_Father: {fileID: 7460618339752046935} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -169.61206, y: -210.74072} - m_SizeDelta: {x: 182.7758, y: 141.4814} + m_AnchoredPosition: {x: -143, y: -413} + m_SizeDelta: {x: 182.7758, y: 174.7193} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2195244406705621482 CanvasRenderer: @@ -34657,15 +34813,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d15cc33cb5978e54cbf53afc211c5ed5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -40544,6 +40700,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7980009432462645888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8155402598736379727} + - component: {fileID: 5358538005321776637} + - component: {fileID: 5614685480276689031} + m_Layer: 5 + m_Name: t1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8155402598736379727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7980009432462645888} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8141764428346637989} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 61, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5358538005321776637 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7980009432462645888} + m_CullTransparentMesh: 1 +--- !u!114 &5614685480276689031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7980009432462645888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 0e2f7f250df9ed04fa76c65caf6eb93c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7993475180587271305 GameObject: m_ObjectHideFlags: 0 diff --git a/box1/Assets/Script/UI/LevelPanel.cs b/box1/Assets/Script/UI/LevelPanel.cs index c7e00863..42fb1ff4 100644 --- a/box1/Assets/Script/UI/LevelPanel.cs +++ b/box1/Assets/Script/UI/LevelPanel.cs @@ -321,7 +321,22 @@ public class LevelPanel : MonoBehaviour if (DataManager.HighestRecordPoints(id)>DataManager.GetInt(0+"LevelRankPoint"+id)) { - + TT.Login((code, anonymousCode, isLogin) => + { + TT.GetUserInfo( + (ref TTUserInfo scUserInfo) => + { + rankName.text = scUserInfo.nickName; + SetAsyncImage(scUserInfo.avatarUrl, rankIcon); + rankPoint.text = DataManager.GetInt(0 + "LevelRankPoint" + id).ToString(); + BoxDebug.Log($"TestGetUserInfo info: {scUserInfo.ToString()}"); + }, + (errMsg) => + { + BoxDebug.Log($"TestGetUserInfo fail: {errMsg}"); + }); + }, + (msg) => { }); } else { @@ -402,6 +417,13 @@ public class LevelPanel : MonoBehaviour wait.SetActive(false); } }); + if (DataManager.NextDay("FirstGame")) + { + DataManager.SetTime("FirstGame"); + TT.ReportAnalytics("a10141"); + DotData.ins.SendEvent("a10104",""); + } + DataManager.chapter = chapterId; switch (levelID) { diff --git a/box1/Assets/Script/UI/MainPanel.cs b/box1/Assets/Script/UI/MainPanel.cs index 8efc0961..a5eca96c 100644 --- a/box1/Assets/Script/UI/MainPanel.cs +++ b/box1/Assets/Script/UI/MainPanel.cs @@ -12,7 +12,7 @@ public class MainPanel : MonoBehaviour public static MainPanel ins; public SpriteAtlas IconAtlas; [SerializeField] private GameObject startPanel;//开始界面 - [SerializeField] private GameObject levelPanel;//关卡界面 + [SerializeField] public GameObject levelPanel;//关卡界面 [SerializeField] private PackPanel packPanel;//背包界面 [SerializeField] private WinPanel winPanel;//胜利界面 [SerializeField] private LosePanel losePanel;//失败界面 diff --git a/box1/Assets/Script/UI/RankListPanel.cs b/box1/Assets/Script/UI/RankListPanel.cs index c15b2a16..1d604f23 100644 --- a/box1/Assets/Script/UI/RankListPanel.cs +++ b/box1/Assets/Script/UI/RankListPanel.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using TTSDK; using UnityEngine; using UnityEngine.UI; @@ -54,19 +55,33 @@ public class RankListPanel : MonoBehaviour } var playerData = new RankData(); - playerData.point = DataManager.HighestRecordPoints(id); - playerData.name = ""; - playerData.iconID = "zz"; - playerData.bo = true; - list.Add(playerData); + TT.Login((code, anonymousCode, isLogin) => + { + TT.GetUserInfo( + (ref TTUserInfo scUserInfo) => + { + playerData.name = scUserInfo.nickName; + playerData.iconID = "zz"; + playerData.bo = true; + playerData.point = DataManager.HighestRecordPoints(id); + list.Add(playerData); - list.Sort((s,x)=>x.point.CompareTo(s.point)); - for (int i = 0; i < _items.Count; i++) - { - _items[i].SetData(list[i]); - } - name.text = playerData.name; - points.text = playerData.point.ToString(); + list.Sort((s,x)=>x.point.CompareTo(s.point)); + for (int i = 0; i < _items.Count; i++) + { + _items[i].SetData(list[i]); + } + name.text = playerData.name; + points.text = playerData.point.ToString(); + BoxDebug.Log($"TestGetUserInfo info: {scUserInfo.ToString()}"); + }, + (errMsg) => + { + BoxDebug.Log($"TestGetUserInfo fail: {errMsg}"); + }); + }, + (msg) => { }); + } private void Close() diff --git a/box1/Assets/Script/UI/RankPanel/RankItem.cs b/box1/Assets/Script/UI/RankPanel/RankItem.cs index 3b250d84..59080fde 100644 --- a/box1/Assets/Script/UI/RankPanel/RankItem.cs +++ b/box1/Assets/Script/UI/RankPanel/RankItem.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TTSDK; using UnityEngine; using UnityEngine.UI; @@ -26,7 +27,20 @@ public class RankItem : MonoBehaviour { if (data.bo) { - + TT.Login((code, anonymousCode, isLogin) => + { + TT.GetUserInfo( + (ref TTUserInfo scUserInfo) => + { + MainPanel.ins.levelPanel.GetComponent().SetAsyncImage(scUserInfo.avatarUrl, icon); + BoxDebug.Log($"TestGetUserInfo info: {scUserInfo.ToString()}"); + }, + (errMsg) => + { + BoxDebug.Log($"TestGetUserInfo fail: {errMsg}"); + }); + }, + (msg) => { }); } else { @@ -35,4 +49,5 @@ public class RankItem : MonoBehaviour name.text = data.name; points.text = data.point.ToString(); } + } diff --git a/box1/Assets/Script/UI/TourPanel.cs b/box1/Assets/Script/UI/TourPanel.cs index cfdefd9b..45b08cd2 100644 --- a/box1/Assets/Script/UI/TourPanel.cs +++ b/box1/Assets/Script/UI/TourPanel.cs @@ -31,6 +31,10 @@ public class TourPanel : MonoBehaviour [SerializeField] private Button eventButton2; [Header("时间倍率")] [SerializeField] private Button timeButton; + + [SerializeField] private GameObject video; + [SerializeField] private GameObject time1; + [SerializeField] private GameObject time2; [Header("设置页面")] [SerializeField] private Button close; [SerializeField] private Button settingButton; @@ -125,7 +129,6 @@ public class TourPanel : MonoBehaviour Move(obj.transform, _eventlist[i].lenght); } Move(targtsTransform,targtsLanght); - timeScale = 0; InitDisplayData(); } @@ -149,10 +152,16 @@ public class TourPanel : MonoBehaviour if (DataManager.GetInt("GetTimeScale")==1) { timeScale = 3; + video.SetActive(false); + time1.SetActive(false); + time2.SetActive(true); } else { timeScale = 1; + video.SetActive(true); + time1.SetActive(true); + time2.SetActive(false); } } @@ -188,18 +197,27 @@ public class TourPanel : MonoBehaviour if (timeScale==3) { timeScale = 1; + time1.SetActive(true); + time2.SetActive(false); } else { timeScale = 3; + time1.SetActive(false); + time2.SetActive(true); } + video.SetActive(false); } else { + AdMgr.Instance.ShowAd((a)=> { + video.SetActive(false); DataManager.SetInt("GetTimeScale",1); timeScale = 3; + time1.SetActive(false); + time2.SetActive(true); }); } } diff --git a/box1/UserSettings/Layouts/default-2022.dwlt b/box1/UserSettings/Layouts/default-2022.dwlt index 78aeb910..54a0e0fa 100644 --- a/box1/UserSettings/Layouts/default-2022.dwlt +++ b/box1/UserSettings/Layouts/default-2022.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 512 - y: 200 - width: 910 - height: 721 - m_ShowMode: 0 - m_Title: BuildTool - m_RootView: {fileID: 5} - m_MinSize: {x: 810, y: 721} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -44,11 +20,11 @@ MonoBehaviour: height: 1032 m_ShowMode: 0 m_Title: Game - m_RootView: {fileID: 7} + m_RootView: {fileID: 4} m_MinSize: {x: 100, y: 121} m_MaxSize: {x: 4000, y: 4021} m_Maximized: 1 ---- !u!114 &3 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -68,62 +44,11 @@ MonoBehaviour: height: 973 m_ShowMode: 4 m_Title: Inspector - m_RootView: {fileID: 12} + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: a6 - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 910 - height: 721 - m_MinSize: {x: 810, y: 721} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 910 - height: 721 - m_MinSize: {x: 810, y: 721} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 147 - draggingID: 0 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -144,12 +69,12 @@ MonoBehaviour: height: 1032 m_MinSize: {x: 100, y: 121} m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -162,7 +87,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 @@ -174,7 +99,7 @@ MonoBehaviour: vertical: 0 controlID: 14 draggingID: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -187,8 +112,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 9} + - {fileID: 12} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -198,9 +123,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 138 + controlID: 40 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -221,12 +146,12 @@ MonoBehaviour: height: 923 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,15 +169,15 @@ MonoBehaviour: x: 0 y: 0 width: 361 - height: 441 + height: 869 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -268,18 +193,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 441 + y: 869 width: 1536 - height: 482 + height: 54 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 25} + m_ActualView: {fileID: 21} m_Panes: + - {fileID: 17} - {fileID: 21} - - {fileID: 25} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,9 +217,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 8} - - {fileID: 14} + - {fileID: 10} + - {fileID: 5} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -307,7 +232,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -329,7 +254,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -350,7 +275,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -363,8 +288,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 16} - - {fileID: 11} + - {fileID: 13} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -376,7 +301,7 @@ MonoBehaviour: vertical: 1 controlID: 41 draggingID: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -389,20 +314,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 17} + - {fileID: 7} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1536 - height: 441 + height: 869 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 controlID: 42 draggingID: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -420,50 +345,16 @@ MonoBehaviour: x: 361 y: 0 width: 1175 - height: 441 + height: 869 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1513232309, guid: 76741459812cc496eb3634fdc0e9cc80, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 810, y: 700} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: BuildTool - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 512 - y: 200 - width: 910 - height: 700 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -561,7 +452,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000100000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -622,7 +513,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -684,7 +575,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 175} m_SelectedIDs: 7e880000 m_LastClickedID: 34942 - m_ExpandedIDs: 00000000b6860000b8860000ba8600004488000000ca9a3bffffff7f + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -700,7 +591,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -712,7 +603,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b6860000b8860000ba860000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -756,7 +647,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 8} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -768,7 +659,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -809,13 +700,13 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 206 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -838,7 +729,7 @@ MonoBehaviour: x: 8 y: 81 width: 360 - height: 420 + height: 848 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -854,7 +745,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 16fbffff + m_ExpandedIDs: 7cf9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -870,7 +761,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -878,7 +769,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -901,7 +792,7 @@ MonoBehaviour: x: 369 y: 81 width: 1173 - height: 420 + height: 848 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1273,9 +1164,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 219.1308, y: 431.37006, z: -8.007305} + m_Target: {x: 1198.5209, y: 1965.1589, z: -2.7057798} speed: 2 - m_Value: {x: 219.1308, y: 431.37006, z: -8.007305} + m_Value: {x: 1198.5209, y: 1965.1589, z: -2.7057798} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1325,9 +1216,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 944.0689 + m_Target: 413.91458 speed: 2 - m_Value: 944.0689 + m_Value: 413.91458 m_Ortho: m_Target: 1 speed: 2 @@ -1352,7 +1243,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &25 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1373,9 +1264,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 522 + y: 950 width: 1535 - height: 461 + height: 33 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/box1/project.config.json b/box1/project.config.json index 26aa2398..a5649f23 100644 --- a/box1/project.config.json +++ b/box1/project.config.json @@ -1 +1 @@ -{"appid":"tt2f5a59e7b06fb35a07","projectname":"box1","unity":{"build":{"webgl":"E:\\Project\\apk\\BoxDY\\webgl_package-20241228_182428.zip","native":{"il2cpp":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\il2cppOutput.zip","apk":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\launcher-release.apk","fullApk":""},"instantGame":""},"publishType":"2","starkSdkVersion":"Without StarkSDK","unityToolsVersion":"4.0.4","unityEngineVersion":"2022.3.44f1c1","arch":"both"}} \ No newline at end of file +{"appid":"tt2f5a59e7b06fb35a07","projectname":"box1","unity":{"build":{"webgl":"E:\\Project\\apk\\BoxDY\\webgl_package-20241230_140603.zip","native":{"il2cpp":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\il2cppOutput.zip","apk":"E:/Project/apk/BoxDY\\box-All-20241106_135915\\launcher-release.apk","fullApk":""},"instantGame":""},"publishType":"2","starkSdkVersion":"Without StarkSDK","unityToolsVersion":"4.0.4","unityEngineVersion":"2022.3.44f1c1","arch":"both"}} \ No newline at end of file