Merge remote-tracking branch 'origin/kill-json-player'
This commit is contained in:
8
Assets/AddressableAssetsData/iOS.meta
Normal file
8
Assets/AddressableAssetsData/iOS.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d60f8ff6bf46b494b80e210228c43e61
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/UI/DR/ramasjang_icon.png
Normal file
BIN
Assets/Art/UI/DR/ramasjang_icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
156
Assets/Art/UI/DR/ramasjang_icon.png.meta
Normal file
156
Assets/Art/UI/DR/ramasjang_icon.png.meta
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 57224356af3d045dbbf8b420e13b4b10
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable:
|
||||||
|
- first:
|
||||||
|
213: 2364528222304962155
|
||||||
|
second: ramasjang_icon_0
|
||||||
|
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: 2
|
||||||
|
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: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: iOS
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: ramasjang_icon_0
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 4
|
||||||
|
y: 5
|
||||||
|
width: 334
|
||||||
|
height: 334
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
customData:
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID: b668fdfe3ed70d020800000000000000
|
||||||
|
internalID: 2364528222304962155
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable:
|
||||||
|
ramasjang_icon_0: 2364528222304962155
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -725,10 +725,9 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3864057818161790164}
|
- component: {fileID: 3864057818161790164}
|
||||||
- component: {fileID: 5271824036850954050}
|
- component: {fileID: 5271824036850954050}
|
||||||
- component: {fileID: 8081783206361873868}
|
|
||||||
- component: {fileID: 5548642987123338363}
|
|
||||||
- component: {fileID: 3058107077406709872}
|
- component: {fileID: 3058107077406709872}
|
||||||
- component: {fileID: 587711432829270645}
|
- component: {fileID: 587711432829270645}
|
||||||
|
- component: {fileID: 4189849640380816173}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Icon
|
m_Name: Icon
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -763,53 +762,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4599222264323240281}
|
m_GameObject: {fileID: 4599222264323240281}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!114 &8081783206361873868
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4599222264323240281}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 0}
|
|
||||||
m_UVRect:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
width: 1
|
|
||||||
height: -1
|
|
||||||
--- !u!114 &5548642987123338363
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4599222264323240281}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2fd09147b9e9d42a48d6ddc915ddc3d2, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: SkiaSharp.Unity::SkiaSharp.Unity.SkottiePlayerV2
|
|
||||||
lottieFile: {fileID: 4900000, guid: 50e22b5bb8a496840952f2563758c13c, type: 3}
|
|
||||||
customResolution: 0
|
|
||||||
resWidth: 250
|
|
||||||
resHeight: 250
|
|
||||||
stateName: Idle
|
|
||||||
resetAfterFinished: 0
|
|
||||||
autoPlay: 1
|
|
||||||
loop: 1
|
|
||||||
--- !u!114 &3058107077406709872
|
--- !u!114 &3058107077406709872
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -850,7 +802,7 @@ MonoBehaviour:
|
|||||||
m_SelectedTrigger: Selected
|
m_SelectedTrigger: Selected
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 8081783206361873868}
|
m_TargetGraphic: {fileID: 0}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls:
|
m_Calls:
|
||||||
@@ -880,6 +832,36 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier: AppleHillsScripts::UI.HudMenuButton
|
m_EditorClassIdentifier: AppleHillsScripts::UI.HudMenuButton
|
||||||
pagePrefab: {fileID: 1498581815400593087, guid: ccd858c7962d48147b0233c1bf1382f5, type: 3}
|
pagePrefab: {fileID: 1498581815400593087, guid: ccd858c7962d48147b0233c1bf1382f5, type: 3}
|
||||||
buttonName: RamaSjang Button
|
buttonName: RamaSjang Button
|
||||||
|
--- !u!114 &4189849640380816173
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4599222264323240281}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 2364528222304962155, guid: 57224356af3d045dbbf8b420e13b4b10, 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 &5113586844274188410
|
--- !u!1 &5113586844274188410
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -148,8 +148,6 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6108475066390421500}
|
|
||||||
- {fileID: 6717870941799174515}
|
|
||||||
- {fileID: 4136733570236406132}
|
- {fileID: 4136733570236406132}
|
||||||
m_Father: {fileID: 1315170081792486277}
|
m_Father: {fileID: 1315170081792486277}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -402,8 +400,8 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier: '::'
|
m_EditorClassIdentifier: '::'
|
||||||
PageName:
|
PageName:
|
||||||
transitionDuration: 0.3
|
transitionDuration: 0.3
|
||||||
rainbowIn: {fileID: 5382650426034128680}
|
rainbowIn: {fileID: 0}
|
||||||
rainbowOut: {fileID: 3983328028282460839}
|
rainbowOut: {fileID: 0}
|
||||||
gameLayoutContainer: {fileID: 904161782565348054}
|
gameLayoutContainer: {fileID: 904161782565348054}
|
||||||
exitButton: {fileID: 8427602740714176801}
|
exitButton: {fileID: 8427602740714176801}
|
||||||
rectMask: {fileID: 7425566603516801919}
|
rectMask: {fileID: 7425566603516801919}
|
||||||
@@ -528,99 +526,6 @@ MonoBehaviour:
|
|||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!1 &3983328028282460839
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 6717870941799174515}
|
|
||||||
- component: {fileID: 6334910097310371923}
|
|
||||||
- component: {fileID: 8821021733826365168}
|
|
||||||
- component: {fileID: 9163925342151684341}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: RainbowOut
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &6717870941799174515
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3983328028282460839}
|
|
||||||
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: 8293076336493130222}
|
|
||||||
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 &6334910097310371923
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3983328028282460839}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &8821021733826365168
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3983328028282460839}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 0}
|
|
||||||
m_UVRect:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
width: 1
|
|
||||||
height: -1
|
|
||||||
--- !u!114 &9163925342151684341
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3983328028282460839}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2fd09147b9e9d42a48d6ddc915ddc3d2, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: SkiaSharp.Unity::SkiaSharp.Unity.SkottiePlayerV2
|
|
||||||
lottieFile: {fileID: 4900000, guid: 589505308c5daf449800f30dd4b92ce7, type: 3}
|
|
||||||
customResolution: 0
|
|
||||||
resWidth: 250
|
|
||||||
resHeight: 250
|
|
||||||
stateName:
|
|
||||||
resetAfterFinished: 0
|
|
||||||
autoPlay: 0
|
|
||||||
loop: 0
|
|
||||||
--- !u!1 &4270065472017787841
|
--- !u!1 &4270065472017787841
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -936,99 +841,6 @@ MonoBehaviour:
|
|||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!1 &5382650426034128680
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 6108475066390421500}
|
|
||||||
- component: {fileID: 2398693306920598044}
|
|
||||||
- component: {fileID: 7920249735731934357}
|
|
||||||
- component: {fileID: 3566391948883171773}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: RainbowIn
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &6108475066390421500
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5382650426034128680}
|
|
||||||
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: 8293076336493130222}
|
|
||||||
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 &2398693306920598044
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5382650426034128680}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &7920249735731934357
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5382650426034128680}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 0}
|
|
||||||
m_UVRect:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
width: 1
|
|
||||||
height: -1
|
|
||||||
--- !u!114 &3566391948883171773
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5382650426034128680}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2fd09147b9e9d42a48d6ddc915ddc3d2, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: SkiaSharp.Unity::SkiaSharp.Unity.SkottiePlayerV2
|
|
||||||
lottieFile: {fileID: 4900000, guid: 622be2ef9d5e27d45a9deaf7ed805f5f, type: 3}
|
|
||||||
customResolution: 0
|
|
||||||
resWidth: 250
|
|
||||||
resHeight: 250
|
|
||||||
stateName:
|
|
||||||
resetAfterFinished: 0
|
|
||||||
autoPlay: 0
|
|
||||||
loop: 0
|
|
||||||
--- !u!1 &5867455130109727138
|
--- !u!1 &5867455130109727138
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -11,9 +11,6 @@
|
|||||||
"OptimizedRope",
|
"OptimizedRope",
|
||||||
"AudioSourceEvents",
|
"AudioSourceEvents",
|
||||||
"NewAssembly",
|
"NewAssembly",
|
||||||
"SkiaSharp.Unity",
|
|
||||||
"SkiaSharp.Editor",
|
|
||||||
"SkiaSharp",
|
|
||||||
"Unity.Cinemachine"
|
"Unity.Cinemachine"
|
||||||
],
|
],
|
||||||
"includePlatforms": [],
|
"includePlatforms": [],
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ using UI.Core;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
using UnityEngine.Events;
|
||||||
using UnityEngine.Playables;
|
using UnityEngine.Playables;
|
||||||
using Svg;
|
|
||||||
|
|
||||||
namespace Minigames.DivingForPictures
|
namespace Minigames.DivingForPictures
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using SkiaSharp.Unity;
|
|
||||||
using Input;
|
using Input;
|
||||||
using AppleHills.Core;
|
using AppleHills.Core;
|
||||||
using UI.Core;
|
using UI.Core;
|
||||||
@@ -11,8 +10,6 @@ using UI;
|
|||||||
|
|
||||||
public class AppSwitcher : UIPage
|
public class AppSwitcher : UIPage
|
||||||
{
|
{
|
||||||
public GameObject rainbowIn;
|
|
||||||
public GameObject rainbowOut;
|
|
||||||
public GameObject gameLayoutContainer;
|
public GameObject gameLayoutContainer;
|
||||||
public GameObject exitButton;
|
public GameObject exitButton;
|
||||||
public RectMask2D rectMask;
|
public RectMask2D rectMask;
|
||||||
@@ -20,8 +17,6 @@ public class AppSwitcher : UIPage
|
|||||||
[Header("Slide Animation Settings")]
|
[Header("Slide Animation Settings")]
|
||||||
public float slideDuration = 0.5f;
|
public float slideDuration = 0.5f;
|
||||||
|
|
||||||
private SkottiePlayerV2 rainbowInPlayer;
|
|
||||||
private SkottiePlayerV2 rainbowOutPlayer;
|
|
||||||
private TweenBase slideInTween;
|
private TweenBase slideInTween;
|
||||||
private TweenBase slideOutTween;
|
private TweenBase slideOutTween;
|
||||||
|
|
||||||
@@ -30,16 +25,13 @@ public class AppSwitcher : UIPage
|
|||||||
base.OnManagedAwake();
|
base.OnManagedAwake();
|
||||||
|
|
||||||
PageName = "AppSwitcher";
|
PageName = "AppSwitcher";
|
||||||
rainbowInPlayer = rainbowIn.GetComponent<SkottiePlayerV2>();
|
|
||||||
rainbowOutPlayer = rainbowOut.GetComponent<SkottiePlayerV2>();
|
|
||||||
|
|
||||||
if (rectMask == null)
|
if (rectMask == null)
|
||||||
{
|
{
|
||||||
rectMask = GetComponent<RectMask2D>();
|
rectMask = GetComponent<RectMask2D>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initially hide both
|
// Initially hide
|
||||||
rainbowIn.SetActive(true);
|
|
||||||
exitButton.SetActive(false);
|
exitButton.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,27 +41,19 @@ public class AppSwitcher : UIPage
|
|||||||
|
|
||||||
gameLayoutContainer.SetActive(true);
|
gameLayoutContainer.SetActive(true);
|
||||||
|
|
||||||
// Hide rainbow out, show rainbow in
|
|
||||||
rainbowOut.SetActive(false);
|
|
||||||
|
|
||||||
// Play animation on rainbow in without resetting state
|
|
||||||
rainbowInPlayer.PlayAnimation(true);
|
|
||||||
|
|
||||||
// Slide in animation - tween padding.left from 1700 to 0
|
// Slide in animation - tween padding.left from 1700 to 0
|
||||||
slideInTween = TweenPaddingLeft(1700f, 0f, Tween.EaseOut, () =>
|
slideInTween = TweenPaddingLeft(1700f, 0f, Tween.EaseOut, () =>
|
||||||
{
|
{
|
||||||
onComplete?.Invoke();
|
onComplete?.Invoke();
|
||||||
rainbowOut.SetActive(true);
|
|
||||||
exitButton.SetActive(true);
|
exitButton.SetActive(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void DoTransitionOut(Action onComplete)
|
protected override void DoTransitionOut(Action onComplete)
|
||||||
{
|
{
|
||||||
rainbowIn.SetActive(false);
|
|
||||||
|
|
||||||
// Play animation on rainbow out with resetting state
|
|
||||||
rainbowOutPlayer.PlayAnimation(true);
|
|
||||||
|
|
||||||
// Hide the exit button
|
// Hide the exit button
|
||||||
exitButton.SetActive(false);
|
exitButton.SetActive(false);
|
||||||
@@ -77,7 +61,6 @@ public class AppSwitcher : UIPage
|
|||||||
// Slide out animation - tween padding.left from 0 to 1700
|
// Slide out animation - tween padding.left from 0 to 1700
|
||||||
slideOutTween = TweenPaddingLeft(0f, 1700f, Tween.EaseIn, () => {
|
slideOutTween = TweenPaddingLeft(0f, 1700f, Tween.EaseIn, () => {
|
||||||
gameLayoutContainer.SetActive(false);
|
gameLayoutContainer.SetActive(false);
|
||||||
rainbowIn.SetActive(true);
|
|
||||||
onComplete?.Invoke();
|
onComplete?.Invoke();
|
||||||
InputManager.Instance.SetInputMode(InputMode.GameAndUI);
|
InputManager.Instance.SetInputMode(InputMode.GameAndUI);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.ammariqais.skiaforunity": "https://github.com/ammariqais/SkiaForUnity.git?path=SkiaUnity/Assets/SkiaSharp",
|
|
||||||
"com.coplaydev.unity-mcp": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity",
|
"com.coplaydev.unity-mcp": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity",
|
||||||
"com.moolt.packages.net": "git+https://github.com/Moolt/UnityAudioSourceEvents?path=Packages/AudioSourceEvents",
|
"com.moolt.packages.net": "git+https://github.com/Moolt/UnityAudioSourceEvents?path=Packages/AudioSourceEvents",
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
|
|||||||
@@ -1,14 +1,5 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.ammariqais.skiaforunity": {
|
|
||||||
"version": "https://github.com/ammariqais/SkiaForUnity.git?path=SkiaUnity/Assets/SkiaSharp",
|
|
||||||
"depth": 0,
|
|
||||||
"source": "git",
|
|
||||||
"dependencies": {
|
|
||||||
"com.unity.nuget.newtonsoft-json": "3.2.0"
|
|
||||||
},
|
|
||||||
"hash": "11e82b71012bf8b4f68172080d6e4969d42120ef"
|
|
||||||
},
|
|
||||||
"com.coplaydev.unity-mcp": {
|
"com.coplaydev.unity-mcp": {
|
||||||
"version": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity",
|
"version": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ PlayerSettings:
|
|||||||
targetDevice: 2
|
targetDevice: 2
|
||||||
useOnDemandResources: 0
|
useOnDemandResources: 0
|
||||||
accelerometerFrequency: 60
|
accelerometerFrequency: 60
|
||||||
companyName: DefaultCompany
|
companyName: DR
|
||||||
productName: AppleHills
|
productName: "DR \xC6blerup"
|
||||||
defaultCursor: {fileID: 0}
|
defaultCursor: {fileID: 0}
|
||||||
cursorHotspot: {x: 0, y: 0}
|
cursorHotspot: {x: 0, y: 0}
|
||||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
||||||
@@ -142,7 +142,7 @@ PlayerSettings:
|
|||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
visionOSBundleVersion: 1.0
|
visionOSBundleVersion: 1.0
|
||||||
tvOSBundleVersion: 1.0
|
tvOSBundleVersion: 1.0
|
||||||
bundleVersion: 1.0.2
|
bundleVersion: 1.1
|
||||||
preloadedAssets: []
|
preloadedAssets: []
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
@@ -168,7 +168,7 @@ PlayerSettings:
|
|||||||
Android: com.DefaultCompany.com.unity.template.mobile2D
|
Android: com.DefaultCompany.com.unity.template.mobile2D
|
||||||
Lumin: com.DefaultCompany.com.unity.template.mobile2D
|
Lumin: com.DefaultCompany.com.unity.template.mobile2D
|
||||||
Standalone: com.DefaultCompany.com.unity.template.mobile2D
|
Standalone: com.DefaultCompany.com.unity.template.mobile2D
|
||||||
iPhone: com.DefaultCompany.com.unity.template.mobile2D
|
iPhone: dk.dr.ramasjang.aeblerup
|
||||||
tvOS: com.DefaultCompany.com.unity.template.mobile2D
|
tvOS: com.DefaultCompany.com.unity.template.mobile2D
|
||||||
buildNumber:
|
buildNumber:
|
||||||
Standalone: 0
|
Standalone: 0
|
||||||
@@ -403,25 +403,31 @@ PlayerSettings:
|
|||||||
m_SubKind:
|
m_SubKind:
|
||||||
- m_BuildTarget: iPhone
|
- m_BuildTarget: iPhone
|
||||||
m_Icons:
|
m_Icons:
|
||||||
|
- m_Textures:
|
||||||
|
- {fileID: 2800000, guid: a8ae11f948f0cfa4791e954c315376ee, type: 3}
|
||||||
|
m_Width: 1024
|
||||||
|
m_Height: 1024
|
||||||
|
m_Kind: 4
|
||||||
|
m_SubKind: App Store
|
||||||
- m_Textures: []
|
- m_Textures: []
|
||||||
m_Width: 120
|
m_Width: 60
|
||||||
m_Height: 120
|
m_Height: 60
|
||||||
m_Kind: 3
|
m_Kind: 2
|
||||||
m_SubKind: iPhone
|
m_SubKind: iPhone
|
||||||
- m_Textures: []
|
|
||||||
m_Width: 80
|
|
||||||
m_Height: 80
|
|
||||||
m_Kind: 3
|
|
||||||
m_SubKind: iPhone
|
|
||||||
- m_Textures: []
|
|
||||||
m_Width: 80
|
|
||||||
m_Height: 80
|
|
||||||
m_Kind: 3
|
|
||||||
m_SubKind: iPad
|
|
||||||
- m_Textures: []
|
- m_Textures: []
|
||||||
m_Width: 40
|
m_Width: 40
|
||||||
m_Height: 40
|
m_Height: 40
|
||||||
m_Kind: 3
|
m_Kind: 2
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 40
|
||||||
|
m_Height: 40
|
||||||
|
m_Kind: 2
|
||||||
|
m_SubKind: iPad
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 20
|
||||||
|
m_Height: 20
|
||||||
|
m_Kind: 2
|
||||||
m_SubKind: iPad
|
m_SubKind: iPad
|
||||||
- m_Textures: []
|
- m_Textures: []
|
||||||
m_Width: 87
|
m_Width: 87
|
||||||
@@ -449,30 +455,25 @@ PlayerSettings:
|
|||||||
m_Kind: 1
|
m_Kind: 1
|
||||||
m_SubKind: iPad
|
m_SubKind: iPad
|
||||||
- m_Textures: []
|
- m_Textures: []
|
||||||
m_Width: 60
|
m_Width: 120
|
||||||
m_Height: 60
|
m_Height: 120
|
||||||
m_Kind: 2
|
m_Kind: 3
|
||||||
m_SubKind: iPhone
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 80
|
||||||
|
m_Height: 80
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPhone
|
||||||
|
- m_Textures: []
|
||||||
|
m_Width: 80
|
||||||
|
m_Height: 80
|
||||||
|
m_Kind: 3
|
||||||
|
m_SubKind: iPad
|
||||||
- m_Textures: []
|
- m_Textures: []
|
||||||
m_Width: 40
|
m_Width: 40
|
||||||
m_Height: 40
|
m_Height: 40
|
||||||
m_Kind: 2
|
m_Kind: 3
|
||||||
m_SubKind: iPhone
|
|
||||||
- m_Textures: []
|
|
||||||
m_Width: 40
|
|
||||||
m_Height: 40
|
|
||||||
m_Kind: 2
|
|
||||||
m_SubKind: iPad
|
m_SubKind: iPad
|
||||||
- m_Textures: []
|
|
||||||
m_Width: 20
|
|
||||||
m_Height: 20
|
|
||||||
m_Kind: 2
|
|
||||||
m_SubKind: iPad
|
|
||||||
- m_Textures: []
|
|
||||||
m_Width: 1024
|
|
||||||
m_Height: 1024
|
|
||||||
m_Kind: 4
|
|
||||||
m_SubKind: App Store
|
|
||||||
- m_Textures:
|
- m_Textures:
|
||||||
- {fileID: 2800000, guid: a8ae11f948f0cfa4791e954c315376ee, type: 3}
|
- {fileID: 2800000, guid: a8ae11f948f0cfa4791e954c315376ee, type: 3}
|
||||||
m_Width: 180
|
m_Width: 180
|
||||||
@@ -507,6 +508,9 @@ PlayerSettings:
|
|||||||
- m_BuildTarget: Android
|
- m_BuildTarget: Android
|
||||||
m_StaticBatching: 1
|
m_StaticBatching: 1
|
||||||
m_DynamicBatching: 0
|
m_DynamicBatching: 0
|
||||||
|
- m_BuildTarget: iPhone
|
||||||
|
m_StaticBatching: 1
|
||||||
|
m_DynamicBatching: 0
|
||||||
m_BuildTargetShaderSettings: []
|
m_BuildTargetShaderSettings: []
|
||||||
m_BuildTargetGraphicsJobs:
|
m_BuildTargetGraphicsJobs:
|
||||||
- m_BuildTarget: MacStandaloneSupport
|
- m_BuildTarget: MacStandaloneSupport
|
||||||
@@ -836,7 +840,7 @@ PlayerSettings:
|
|||||||
webEnableSubmoduleStrippingCompatibility: 0
|
webEnableSubmoduleStrippingCompatibility: 0
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
Android: ENABLE_LOG
|
Android: ENABLE_LOG
|
||||||
iPhone: __UNIFIED__;__IOS__
|
iPhone:
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments: {}
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend:
|
scriptingBackend:
|
||||||
|
|||||||
Reference in New Issue
Block a user