finish content

kaikue · Oct 31, 2021 · 69b2166 · 69b2166
1 parent b0ea43f
commit 69b2166
Show file tree

Hide file tree

Showing 96 changed files with 62,673 additions and 1,970 deletions.
diff --git a/Assets/Prefabs/Dialogs/DialogEnd.prefab b/Assets/Prefabs/Dialogs/DialogEnd.prefab
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8847023019133506549
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474458, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474459, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: dialogLines.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474459, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: dialogLines.Array.data[0].text
+      value: NOOOOOOOOOOOOO!!!
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474459, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: dialogLines.Array.data[0].charWaitTime
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6872278571977474460, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
+      propertyPath: m_Name
+      value: DialogEnd
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8a9bc5204a7e6a241ae432820533a96f, type: 3}
diff --git a/Assets/Prefabs/Dialogs/DialogEnd.prefab.meta b/Assets/Prefabs/Dialogs/DialogEnd.prefab.meta
diff --git a/Assets/Prefabs/FinalChoiceEffects.prefab b/Assets/Prefabs/FinalChoiceEffects.prefab
@@ -58,7 +58,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: -1721915123
-  m_SortingOrder: 0
+  m_SortingOrder: 10
   m_TargetDisplay: 0
 --- !u!114 &3270235113464650608
 MonoBehaviour:

diff --git a/Assets/Prefabs/attack.prefab b/Assets/Prefabs/attack.prefab
@@ -72,7 +72,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -1417662515
-  m_SortingLayer: 5
+  m_SortingLayer: 6
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 17a7a5c68febc2d4d8a3aefed507db55, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -123,3 +123,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 91568dc069940354b8bd0bed48245916, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  decayTime: 0.1
+  hearts: 0
+  knockback: 0
+  attackSprites:
+  - {fileID: 21300000, guid: 17a7a5c68febc2d4d8a3aefed507db55, type: 3}
+  - {fileID: 21300000, guid: e848628390701954dbca0c838009fea8, type: 3}
+  - {fileID: 21300000, guid: 689654c124e280f489085fdcca084f1f, type: 3}
+  - {fileID: 21300000, guid: 875100bc83c94814e85631a038b1d613, type: 3}