diff --git a/Assets/ResWork/GameData.meta b/Assets/ResWork/GameData.meta new file mode 100644 index 0000000..fda5118 --- /dev/null +++ b/Assets/ResWork/GameData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8234706b4b34ed745a48509c23ff2bc2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/GameData/BounceMat.physicsMaterial2D b/Assets/ResWork/GameData/BounceMat.physicsMaterial2D new file mode 100644 index 0000000..f2277b5 --- /dev/null +++ b/Assets/ResWork/GameData/BounceMat.physicsMaterial2D @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BounceMat + serializedVersion: 2 + friction: 0 + bounciness: 0.5 + m_FrictionCombine: 1 + m_BounceCombine: 4 diff --git a/Assets/ResWork/GameData/BounceMat.physicsMaterial2D.meta b/Assets/ResWork/GameData/BounceMat.physicsMaterial2D.meta new file mode 100644 index 0000000..6a02540 --- /dev/null +++ b/Assets/ResWork/GameData/BounceMat.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbbdaae1658fcc745809591f8bec3ca0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/GameData/LuckyGameObj.prefab b/Assets/ResWork/GameData/LuckyGameObj.prefab new file mode 100644 index 0000000..9145d62 --- /dev/null +++ b/Assets/ResWork/GameData/LuckyGameObj.prefab @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6939998903098416576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7252178459079484238} + - component: {fileID: 2007710277984516474} + - component: {fileID: 613301010048255497} + - component: {fileID: 1260999574391235090} + - component: {fileID: 1301368102676062178} + m_Layer: 5 + m_Name: LuckyGameObj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7252178459079484238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939998903098416576} + 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: 0} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2007710277984516474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939998903098416576} + m_CullTransparentMesh: 1 +--- !u!114 &613301010048255497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939998903098416576} + 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: 32a7825797de0fb4a8f0cbf27f95ea48, 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!50 &1260999574391235090 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939998903098416576} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0.3 + m_Material: {fileID: 6200000, guid: cbbdaae1658fcc745809591f8bec3ca0, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &1301368102676062178 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939998903098416576} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 40 diff --git a/Assets/ResWork/GameData/LuckyGameObj.prefab.meta b/Assets/ResWork/GameData/LuckyGameObj.prefab.meta new file mode 100644 index 0000000..7d3ea05 --- /dev/null +++ b/Assets/ResWork/GameData/LuckyGameObj.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 762ff4ec5a22c6b45978c6b031b0e7e5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/Export/GachaReward.json b/Assets/ResWork/Table/Export/GachaReward.json index 5beed0c..1af0d09 100644 --- a/Assets/ResWork/Table/Export/GachaReward.json +++ b/Assets/ResWork/Table/Export/GachaReward.json @@ -1 +1 @@ -[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Lucky", "n_GachaRate": "50", "n_RewardMinCount": "1", "n_RewardMaxCount": "2", "f_LuckyBonusRate": "1"}] \ No newline at end of file +[{"n_GachaGrade": "1", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "1", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "5", "n_RewardMaxCount": "10", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "2", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "3", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "4", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "5", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "6", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "7", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "AlbumOpen", "n_GachaRate": "10", "n_RewardMinCount": "10", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Chat", "n_GachaRate": "1", "n_RewardMinCount": "5", "n_RewardMaxCount": "20", "f_LuckyBonusRate": "1.5"}, {"n_GachaGrade": "8", "e_GachaRewardType": "Gacha", "n_GachaRate": "100", "n_RewardMinCount": "1", "n_RewardMaxCount": "1", "f_LuckyBonusRate": "0.5"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index 914e15b..12363d7 100644 Binary files a/Assets/ResWork/Table/SheGotWet.xlsm and b/Assets/ResWork/Table/SheGotWet.xlsm differ diff --git a/Assets/ResWork/Table/table_gachareward.cs b/Assets/ResWork/Table/table_gachareward.cs index e0c2537..a16e6e3 100644 --- a/Assets/ResWork/Table/table_gachareward.cs +++ b/Assets/ResWork/Table/table_gachareward.cs @@ -62,14 +62,14 @@ public class table_gachareward : table_base base.Start(); } - public (eMoney, int) Get_Reward(int grade) + public (eMoney, int, int) Get_Reward(int grade) { // grade에 맞는 모든 보상 후보 가져오기 var candidates = tableDatas.Where(d => d.n_GachaGrade == grade).ToList(); if (candidates.Count == 0) { Debug.LogError($"[table_gachareward] No reward found for grade {grade}"); - return (default(eMoney), 0); + return (default(eMoney), 0, 0); } // 가중치 합산 @@ -93,12 +93,13 @@ public class table_gachareward : table_base if (selected == null) { Debug.LogError($"[table_gachareward] Failed to select reward for grade {grade}"); - return (default(eMoney), 0); + return (default(eMoney), 0, 0); } // 보상 개수 랜덤 int count = Random.Range(selected.n_RewardMinCount, selected.n_RewardMaxCount + 1); + int lucky = Mathf.Max(1, (int)(count * selected.f_LuckyBonusRate)); - return (selected.e_GachaRewardType, count); + return (selected.e_GachaRewardType, count, lucky); } } \ No newline at end of file diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d4325fc..1859f8b 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -421,6 +421,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 41267002} m_CullTransparentMesh: 1 +--- !u!1 &48693079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 48693080} + m_Layer: 5 + m_Name: Game + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &48693080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48693079} + 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: 1257193656} + m_Father: {fileID: 1703079398} + 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!1 &48983096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 48983097} + m_Layer: 5 + m_Name: Boobs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &48983097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48983096} + 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: 1078095980} + m_Father: {fileID: 1257193656} + 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!1 &67678373 GameObject: m_ObjectHideFlags: 0 @@ -1760,6 +1832,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 304977481} m_CullTransparentMesh: 1 +--- !u!1 &314847184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 314847185} + - component: {fileID: 314847188} + - component: {fileID: 314847187} + - component: {fileID: 314847186} + m_Layer: 5 + m_Name: i_girl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &314847185 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314847184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1257193656} + 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: -300.08093} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &314847186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314847184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 3 + m_AspectRatio: 0.6667 +--- !u!114 &314847187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314847184} + 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: 38faf4b1b79d421409ae711c54f00723, 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!222 &314847188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314847184} + m_CullTransparentMesh: 1 --- !u!1 &316469230 GameObject: m_ObjectHideFlags: 0 @@ -2641,6 +2803,88 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &420248620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420248621} + - component: {fileID: 420248622} + m_Layer: 5 + m_Name: Bot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &420248621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420248620} + 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: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &420248622 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420248620} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 5000, y: 100} + m_EdgeRadius: 0 --- !u!1 &438900832 GameObject: m_ObjectHideFlags: 0 @@ -5690,6 +5934,106 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 836491185} m_CullTransparentMesh: 1 +--- !u!1 &838805450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838805451} + - component: {fileID: 838805452} + - component: {fileID: 838805453} + m_Layer: 5 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &838805451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838805450} + 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: 1 + m_Children: [] + m_Father: {fileID: 1078095980} + 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: 252, y: -325} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!58 &838805452 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838805450} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 180 +--- !u!50 &838805453 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838805450} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1000 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &854486762 GameObject: m_ObjectHideFlags: 0 @@ -6652,6 +6996,88 @@ RectTransform: m_AnchoredPosition: {x: -19, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &993386005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993386006} + - component: {fileID: 993386007} + m_Layer: 5 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &993386006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993386005} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -44, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &993386007 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993386005} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 5000, y: 100} + m_EdgeRadius: 0 --- !u!1 &1005841922 GameObject: m_ObjectHideFlags: 0 @@ -7290,6 +7716,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1065264769} m_CullTransparentMesh: 1 +--- !u!1 &1078095979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1078095980} + m_Layer: 5 + m_Name: Girl (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1078095980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078095979} + 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: 2007068672} + - {fileID: 838805451} + m_Father: {fileID: 48983097} + 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!1 &1092952228 GameObject: m_ObjectHideFlags: 0 @@ -8377,6 +8840,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250211778} m_CullTransparentMesh: 1 +--- !u!1 &1257193655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257193656} + m_Layer: 5 + m_Name: Lucky + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1257193656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257193655} + 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: 314847185} + - {fileID: 1999037950} + - {fileID: 48983097} + - {fileID: 1757808306} + m_Father: {fileID: 48693080} + 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!1 &1292285443 GameObject: m_ObjectHideFlags: 0 @@ -10025,6 +10527,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1620551537} m_CullTransparentMesh: 1 +--- !u!1 &1626145303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1626145304} + - component: {fileID: 1626145305} + m_Layer: 5 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1626145304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626145303} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 44, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1626145305 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626145303} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 5000, y: 100} + m_EdgeRadius: 0 --- !u!1 &1630921640 GameObject: m_ObjectHideFlags: 0 @@ -11193,6 +11777,7 @@ RectTransform: - {fileID: 2062026438} - {fileID: 240605636} - {fileID: 817765913} + - {fileID: 48693080} m_Father: {fileID: 456601672} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -11296,6 +11881,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1707166729} m_CullTransparentMesh: 1 +--- !u!224 &1722836502 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + m_PrefabInstance: {fileID: 2750105378054543255} + m_PrefabAsset: {fileID: 0} --- !u!1 &1727992802 GameObject: m_ObjectHideFlags: 0 @@ -11779,6 +12369,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1754370769} m_CullTransparentMesh: 1 +--- !u!1 &1757808305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1757808306} + m_Layer: 5 + m_Name: WaterPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1757808306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757808305} + 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: 1722836502} + m_Father: {fileID: 1257193656} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -128.60004} + m_SizeDelta: {x: 0, y: 257.1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1760457450 GameObject: m_ObjectHideFlags: 0 @@ -13428,6 +14054,44 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 418.31} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1999037949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1999037950} + m_Layer: 5 + m_Name: Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1999037950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999037949} + 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: 993386006} + - {fileID: 1626145304} + - {fileID: 420248621} + m_Father: {fileID: 1257193656} + 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!1 &2004235291 GameObject: m_ObjectHideFlags: 0 @@ -13574,6 +14238,106 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2007068671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2007068672} + - component: {fileID: 2007068673} + - component: {fileID: 2007068674} + m_Layer: 5 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2007068672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007068671} + 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: 1 + m_Children: [] + m_Father: {fileID: 1078095980} + 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: -200, y: -315} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!58 &2007068673 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007068671} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 180 +--- !u!50 &2007068674 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007068671} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1000 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &2013608477 GameObject: m_ObjectHideFlags: 0 @@ -14694,6 +15458,103 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 418.31} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &2750105378054543255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1757808306} + m_Modifications: + - target: {fileID: 6939998903098416576, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_Name + value: LuckyGameObj + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7252178459079484238, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 762ff4ec5a22c6b45978c6b031b0e7e5, type: 3} --- !u!1001 &9115509774314965572 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 747125a..6f572e3 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -37,8 +37,10 @@ public class GachaUI : uScrollViewMgr DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); SaveMgr.Ins.Add_Money(reward.Item1, reward.Item2); + SaveMgr.Ins.Add_Money(eMoney.Lucky, reward.Item3); SaveMgr.Ins.Save(); - list_log.Add(reward); + list_log.Add((reward.Item1, reward.Item2)); + list_log.Add((eMoney.Lucky, reward.Item3)); Set_ScrollView(list_log); Set_Vertical_ScrollEnd(0); Set_UI();