Merge branch 'tetris' into prefab

Assets/Animation/Enemy/melee.controller

@@ -13,25 +13,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: AttackTrigger
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: DamagedTrigger
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: DeadTrigger
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: knockbackDistance
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

Assets/Animation/Player/PlayerIdleAnim.anim

@@ -30,7 +30,7 @@ AnimationClip:
       value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3}
     - time: 0.5
       value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3}
-    - time: 0.6
+    - time: 0.6166667
       value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3}
     - time: 0.7
       value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3}

Assets/Prefabs/Characters/Enemy/Goblin.prefab

@@ -21,7 +21,7 @@ GameObject:
   - component: {fileID: 4015301101001556}
   - component: {fileID: 212540714587432698}
   - component: {fileID: 95413729269184064}
-  - component: {fileID: 114138317320723260}
+  - component: {fileID: 114118738857420128}
   m_Layer: 0
   m_Name: Body
   m_TagString: Untagged
@@ -71,7 +71,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1225288737757304}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.15799999, y: 0.40100002, z: 0}
+  m_LocalPosition: {x: -0.234, y: 0.621, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4140258981397796}
@@ -98,7 +98,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1636491341446076}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 6.876, y: 1.034, z: -0.1645136}
+  m_LocalPosition: {x: 6.01, y: 2.009, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4015301101001556}
@@ -133,11 +133,11 @@ BoxCollider2D:
   m_GameObject: {fileID: 1636491341446076}
   m_Enabled: 1
   m_Density: 1
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 90e689a435f304c469db49daef28ed89, type: 2}
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.08, y: 0.325}
+  m_Offset: {x: -0.020877361, y: 0.5497493}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -148,7 +148,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.55, y: 1.1}
+  m_Size: {x: 0.5978651, y: 1.1179954}
   m_EdgeRadius: 0
 --- !u!61 &61362187134790794
 BoxCollider2D:
@@ -193,7 +193,7 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &114138317320723260
+--- !u!114 &114118738857420128
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -201,12 +201,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 1225288737757304}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f12bf401d26646a488bc32ca7e3845be, type: 3}
+  m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   monsterID: 101
   maxHealth: 5
-  weight: 3
+  weight: 1
   patrolRange: 2
   noticeRange: 2
   attackRange: 1

Assets/Prefabs/Characters/Player.prefab

@@ -44,7 +44,6 @@ GameObject:
   - component: {fileID: 61129044981816742}
   - component: {fileID: 114402380471012178}
   - component: {fileID: 60342798607647292}
-  - component: {fileID: 114190796731463818}
   m_Layer: 0
   m_Name: AttackColider
   m_TagString: Untagged
@@ -195,22 +194,6 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &114190796731463818
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1862495014651308}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  damage: 0
-  knockBackMultiplier: 1
-  debuffNum: 0
-  debuffType: 
-  debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
 --- !u!114 &114294925164316638
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -279,13 +262,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackRaw:
-  - 0
-  - 0
-  - 0
-  attackKeyState: 000000000000000000000000
-  cancelRaw: 0
-  cancelKeyState: 0
+  attack: 000000
+  cancel: 0
   playingSkill: 0
   comboTime: 1
   time: {fileID: 0}
@@ -295,10 +273,11 @@ MonoBehaviour:
   anim: {fileID: 95992411616135034}
   aoc: {fileID: 0}
   normalAttack:
-  - {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
-  - {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
-  - {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
+  - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
+  - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
+  - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
   inventoryManager: {fileID: 0}
+  lifeStoneManager: {fileID: 0}
 --- !u!114 &114906702720267008
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -310,7 +289,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  LCUI: {fileID: 0}
   ttx: 8
   tty: 0
 --- !u!212 &212187280661781960

Assets/Prefabs/EnemyManager.prefab

@@ -53,6 +53,22 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   player: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
   dropTableData: {fileID: 4900000, guid: 6216895c658a2af40890a4446cc10a8c, type: 3}
-  dropItemList: []
+  dropItemList:
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
   enemyPrefab:
   - {fileID: 1636491341446076, guid: a164c147037e89448820f7387c724c42, type: 2}

Assets/Prefabs/MapManager.prefab

@@ -20,6 +20,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4821016865928708}
   - component: {fileID: 114144154128578016}
+  - component: {fileID: 114476419532778440}
   m_Layer: 0
   m_Name: MapManager
   m_TagString: MapManager
@@ -60,6 +61,7 @@ MonoBehaviour:
   tetriminoCreatedTime: 0
   collapseTime: 10
   spawnBossTetrimino: 0
+  tetriminoCost: 1
   fog: {fileID: 1100171732424598, guid: b8ab69a93ba618c47b27cc04eb431b3f, type: 2}
   clearedFog: {fileID: 1767033925555920, guid: df8687fe46befb34eaf9d4d63938d946, type: 2}
   press: {fileID: 114990664041074520, guid: 8e750fd197a05d84c9fb8557eb95c666, type: 2}
@@ -157,3 +159,103 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 11a6aa89a6f22a1498c4854c839c66e2, type: 3}
   - {fileID: 21300000, guid: b335c0d893e3c6847a861fd71c0348cd, type: 3}
   - {fileID: 21300000, guid: 00ec1514415c08349b130dbd95b9d270, type: 3}
+--- !u!114 &114476419532778440
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1519889983907966}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adab373df646d5f4fb794a3b6ffdf2d7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  allTiles:
+  - {fileID: 11400000, guid: cad5b727dcc80234584fe4c3d4bac3ac, type: 2}
+  - {fileID: 11400000, guid: 648b887233c145948994a645b8a15292, type: 2}
+  - {fileID: 11400000, guid: ac15a9d37231f6d4f94081f8ea438ca2, type: 2}
+  - {fileID: 11400000, guid: 0cb66097ea1594546a4f960cc9f07559, type: 2}
+  - {fileID: 11400000, guid: dd2baabc994e82b428b60358dce9770c, type: 2}
+  - {fileID: 11400000, guid: 422af6123b96a56498ff5186bd9e5eb3, type: 2}
+  - {fileID: 11400000, guid: 6265c644b6f05b24080f71eeaf61b9d6, type: 2}
+  - {fileID: 11400000, guid: b5752031039c8f3458f6e05e529555c5, type: 2}
+  - {fileID: 11400000, guid: d4a019c0fb2fc824292e8d51566a3352, type: 2}
+  - {fileID: 11400000, guid: 7a9a7b6438f3760468118f894a642b4b, type: 2}
+  - {fileID: 11400000, guid: 67722b09db0ca06479b2697c42b9e319, type: 2}
+  - {fileID: 11400000, guid: b37597377cfcbba4a994a931d0948bae, type: 2}
+  - {fileID: 11400000, guid: 0f2eb74e79ddb504c8a0ce2dc6c9f254, type: 2}
+  - {fileID: 11400000, guid: 87f27825f48c3394ea02d8bd4a5c646a, type: 2}
+  - {fileID: 11400000, guid: 50868aeb081760045b48273955f23998, type: 2}
+  - {fileID: 11400000, guid: dc3200317ac5d9c45b4116ad7975f166, type: 2}
+  - {fileID: 11400000, guid: be5b9f120ea162a4fae348edd1700256, type: 2}
+  - {fileID: 11400000, guid: c161c4b186dd4aa40941aa3873d6c5ec, type: 2}
+  - {fileID: 11400000, guid: 4bc30c62b57fe2b4ea26b12ed4f64616, type: 2}
+  - {fileID: 11400000, guid: fed924c0de37ea54d9cf7f8c1b023415, type: 2}
+  - {fileID: 11400000, guid: c20cd0b9e189f6843a083d396400fc3f, type: 2}
+  - {fileID: 11400000, guid: 04f046ca64f78cf46ad40b850a92eb82, type: 2}
+  - {fileID: 11400000, guid: ffb8981088ddffb4285fea807e2b3c1f, type: 2}
+  - {fileID: 11400000, guid: 043ac57223c8ae54fa327e6bcc9e7521, type: 2}
+  - {fileID: 11400000, guid: 669e8afc72c10884ea7947b22f2b2fc3, type: 2}
+  - {fileID: 11400000, guid: f2e0d651aceb3794684dc5054419e5ac, type: 2}
+  - {fileID: 11400000, guid: 0138237a8bdcade46a3fbc010a084e2d, type: 2}
+  - {fileID: 11400000, guid: 0052bfa029fde2d4da209f3a415d4d13, type: 2}
+  - {fileID: 11400000, guid: dd57f268277a5cb4c8d4565b2e147589, type: 2}
+  - {fileID: 11400000, guid: 31c908b438ce83e47a64c959a478bb8d, type: 2}
+  - {fileID: 11400000, guid: 90259c34b37b51242b51d43ca3362b5c, type: 2}
+  - {fileID: 11400000, guid: 90c5b4d5bcbc3a547877632232b95177, type: 2}
+  - {fileID: 11400000, guid: 0e6537561a28c1c40942d254afb68120, type: 2}
+  - {fileID: 11400000, guid: 108adc3f539d380458344bf0d5b8d733, type: 2}
+  - {fileID: 11400000, guid: b927519b2958b624592a3d442290b4b7, type: 2}
+  - {fileID: 11400000, guid: d550736516a355d4b86c12beed506b8c, type: 2}
+  - {fileID: 11400000, guid: 49752582447c745478786e42ea1a7026, type: 2}
+  - {fileID: 11400000, guid: cc2a48f5a5c3ac44aab4daa274bcd53c, type: 2}
+  - {fileID: 11400000, guid: 9a834ca1032b54840b5dd3ab2b8e2119, type: 2}
+  - {fileID: 11400000, guid: 7c35776fae716e94cbbfd933b0722de3, type: 2}
+  - {fileID: 11400000, guid: c504385ebc9d29d43a8a661588b0e066, type: 2}
+  - {fileID: 11400000, guid: bb92e64301811904496b958d4ee5ce8b, type: 2}
+  - {fileID: 11400000, guid: 5c7253594b523944c80de879c00c9343, type: 2}
+  - {fileID: 11400000, guid: 0322bb062f734d64a89288f202c89cf2, type: 2}
+  - {fileID: 11400000, guid: 99f2f680aa1537d449774f32f91f6327, type: 2}
+  - {fileID: 11400000, guid: 81155fc6fe2288340bb0248e49de6fd4, type: 2}
+  - {fileID: 11400000, guid: b57bd0e2da957f743b5a94d6c64935ee, type: 2}
+  - {fileID: 11400000, guid: ff108953036093b41a053da202b37e3f, type: 2}
+  - {fileID: 11400000, guid: f221214a2c33408408e6465b9b62707b, type: 2}
+  - {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2}
+  - {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2}
+  - {fileID: 11400000, guid: e098a71dffeef434782b487a75cfaab6, type: 2}
+  - {fileID: 11400000, guid: 43ce5674905ab684096018dc998da9bf, type: 2}
+  - {fileID: 11400000, guid: 928a04c9f7e45fb4180c93cd01cd0bab, type: 2}
+  - {fileID: 11400000, guid: ba7bc116ed9339d409f01707034be181, type: 2}
+  - {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2}
+  - {fileID: 11400000, guid: 891953fcb438d3d43b96fbe5346a10d0, type: 2}
+  - {fileID: 11400000, guid: 2548ea7ff23f65e44ab5230199dd5ffd, type: 2}
+  - {fileID: 11400000, guid: 41e7ff0cd05627b4e8748e9f8710ae4a, type: 2}
+  - {fileID: 11400000, guid: 7967111718d293949b91d353e305d41b, type: 2}
+  - {fileID: 11400000, guid: d54e80b6b48e4b84e82dc89fab2eec4c, type: 2}
+  - {fileID: 11400000, guid: 15d577ee582539a428774fae0aa92521, type: 2}
+  - {fileID: 11400000, guid: 169960bd68700e8428601cf0e964e075, type: 2}
+  - {fileID: 11400000, guid: 93ef264d67586af4e8186cb2d6d063a4, type: 2}
+  - {fileID: 11400000, guid: 90d876a9b6f7ffe40bb5f4968aa15a8a, type: 2}
+  - {fileID: 11400000, guid: c1cfe3e44c0b2ef4baad8810753b16ff, type: 2}
+  - {fileID: 11400000, guid: 97b76abc1b0192344b4102e3a4aed3a1, type: 2}
+  - {fileID: 11400000, guid: d6da15134c70ccf4aaa74e311e9954ee, type: 2}
+  - {fileID: 11400000, guid: 2534d95235b7719429de931fddf2c43a, type: 2}
+  - {fileID: 11400000, guid: e2c27bfc451e7864a9b32f1d8d73b680, type: 2}
+  - {fileID: 11400000, guid: 7e99c656ec50d2d46a9cbaacd3c9f3de, type: 2}
+  - {fileID: 11400000, guid: bd3a1ff650a799843a3829e115df92c1, type: 2}
+  - {fileID: 11400000, guid: 84fb25f006fce7041806bbfd83a602a0, type: 2}
+  - {fileID: 11400000, guid: 25c90490a2316df469e5bd44d8afbc29, type: 2}
+  - {fileID: 11400000, guid: 1ce1860259e08da45a4ea022c88edd53, type: 2}
+  - {fileID: 11400000, guid: a4896bb88c72d0a47a788ed90ad821c5, type: 2}
+  - {fileID: 11400000, guid: 2cb63616019c26049ae9ec48609abca0, type: 2}
+  - {fileID: 11400000, guid: 766c1d88311ca494faecd8d098856b3d, type: 2}
+  - {fileID: 11400000, guid: 72e2d0ad04f078645bea73cd545fbcdd, type: 2}
+  - {fileID: 11400000, guid: 7f2cb226c22e83e46a25d1507f4c289a, type: 2}
+  - {fileID: 11400000, guid: 9e85b8d472f51d8459d3ec7a00174d82, type: 2}
+  - {fileID: 11400000, guid: 4024617146b4eab4eb99e4690fc668ab, type: 2}
+  - {fileID: 11400000, guid: f6e31b8ca9a3cc749b29fd1423ac6e56, type: 2}
+  - {fileID: 11400000, guid: 494963f1e28fd934b848acd5dbe1d740, type: 2}
+  - {fileID: 11400000, guid: 5426ac20d4553714888c96c1f6133bfc, type: 2}
+  - {fileID: 11400000, guid: da9aae37520c9aa4ab16621fa2143b4f, type: 2}
+  - {fileID: 11400000, guid: 8053217ed4b04674990f6fd04049e6a4, type: 2}
+  - {fileID: 11400000, guid: b5fcd2f2e4c67fc43a358769246cbc31, type: 2}

Assets/Prefabs/Rooms/fog.prefab

@@ -80,7 +80,7 @@ SpriteRenderer:
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 14.08, y: 14.08}
+  m_Size: {x: 22, y: 22}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1

Assets/Prefabs/TetrisMap/Portal.prefab

@@ -65,7 +65,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1, y: 2.5}
+  m_Size: {x: 3.2, y: 2.35}
   m_EdgeRadius: 0
 --- !u!114 &114406776515389056
 MonoBehaviour:

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1527786608046418}
+  m_IsPrefabAsset: 1
+--- !u!1 &1527786608046418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224972690153283332}
+  - component: {fileID: 222166020728861802}
+  - component: {fileID: 114236033364242192}
+  m_Layer: 5
+  m_Name: CharA
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114236033364242192
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1527786608046418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 0f9aa2df06e79a64d8981a956eb12226, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222166020728861802
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1527786608046418}
+  m_CullTransparentMesh: 0
+--- !u!224 &224972690153283332
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1527786608046418}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 65, y: 85}
+  m_Pivot: {x: 0, y: 0.5}

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharA.prefab.meta

+fileFormatVersion: 2
+guid: 3252ff0fe02ec68499890a51519cdfaa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1168427048054670}
+  m_IsPrefabAsset: 1
+--- !u!1 &1168427048054670
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224861534921566450}
+  - component: {fileID: 222226625917723382}
+  - component: {fileID: 114631941095027810}
+  m_Layer: 5
+  m_Name: CharB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114631941095027810
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1168427048054670}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 8a73c5ced4d09b74f89078836b9bd890, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222226625917723382
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1168427048054670}
+  m_CullTransparentMesh: 0
+--- !u!224 &224861534921566450
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1168427048054670}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 70, y: 85}
+  m_Pivot: {x: 0, y: 0.5}

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharB.prefab.meta

+fileFormatVersion: 2
+guid: 26051c4537810bb4487e25937ee6c76e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1002363342713840}
+  m_IsPrefabAsset: 1
+--- !u!1 &1002363342713840
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224109398812551856}
+  - component: {fileID: 222322044912383444}
+  - component: {fileID: 114083384941441790}
+  m_Layer: 5
+  m_Name: CharC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114083384941441790
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002363342713840}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: eff9d90dcca182243875912722e0cec7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222322044912383444
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002363342713840}
+  m_CullTransparentMesh: 0
+--- !u!224 &224109398812551856
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002363342713840}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 65, y: 85}
+  m_Pivot: {x: 0, y: 0.5}

Assets/Prefabs/UI/In-Game UI/InventoryUI/CharC.prefab.meta

+fileFormatVersion: 2
+guid: e65160b48052e084fbede0901c02527c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryManager.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 674793b622d7c184882dfeb8784bbf92, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemPool: []
-  addonPool: []
   droppedPrefab: {fileID: 1610049888013262, guid: ee63f05b79e18ce4bad2c226aa70a28e,
     type: 2}
+  popoutStrengthMultiplier: 4
+  popoutTime: 0.3

Assets/Prefabs/UI/In-Game UI/LifeStoneUI.prefab

@@ -93,10 +93,14 @@ MonoBehaviour:
   stoneSuper: {fileID: 1874721051176178}
   lifeUnitPrefab: {fileID: 1274079429510600, guid: c1fa87a24452e5745859b739e4a5254b,
     type: 2}
+  goldPotionPrefab: {fileID: 1778675533210814, guid: 57c0f65ad47e39943a69b5b0a6fa0e47,
+    type: 2}
   vibrationVariable: 0.1
   droppedLifeStonePrefab: {fileID: 1149595688849768, guid: 8255a117a93935941b32b4aed9b299a0,
     type: 2}
   frameBorder: 0.2
+  popoutStrengthMultiplier: 3
+  popoutTime: 0.3
 --- !u!224 &224255635903845628
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/LifeUnitHighlight.prefab

@@ -72,9 +72,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 996861525
-  m_SortingLayer: 8
-  m_SortingOrder: 0
+  m_SortingLayerID: 2145601713
+  m_SortingLayer: 9
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: aa7dc19ed61c9bd45b964e4bdf98b84b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/goldPotion.prefab.meta

+fileFormatVersion: 2
+guid: 57c0f65ad47e39943a69b5b0a6fa0e47
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Rooms/SpecialRoom/Room Start_enemyAdded.prefab.meta → Assets/Resources/Animations/normalAttackA.anim.meta

 fileFormatVersion: 2
-guid: c7a987df794900341bf68b8263f6e205
+guid: b1bf5cd583e214e448b83335f6c2d7a6
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 7400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Sprites/Items/Baculus.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -63,7 +63,18 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0