Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev

2025-03-01 21:46:34 +09:00
parent 068cab2d8a fb9423ac25
commit e33314e29b
40 changed files with 430 additions and 13 deletions
--- a/Gameton-06/Assets/Gameton/Resources/Arcade
+++ b/Gameton-06/Assets/Gameton/Resources/Arcade
--- a/Gameton-06/Assets/Gameton/Resources/Arcade
+++ b/Gameton-06/Assets/Gameton/Resources/Arcade
@@ -1,23 +0,0 @@
-fileFormatVersion: 2
-guid: 7e82105a0d9784144ae38fc5230a777d
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 7
-  defaultSettings:
-    serializedVersion: 2
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-    preloadAudioData: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab
@@ -643,3 +643,6 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab
@@ -562,6 +562,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &7570151098365513060
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab
@@ -229,6 +229,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3}
+  _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &3020795925047894191
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab
@@ -229,6 +229,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &1425971833131969348
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab
@@ -568,6 +568,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0f19b48052aaaf249b0961eb5a51fce0, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &8136905868517816863
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab
@@ -643,3 +643,6 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3}
+  _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab
@@ -305,6 +305,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &5762289934519905782
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab
@@ -310,6 +310,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &4890974773502705404
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab
@@ -386,6 +386,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3}
+  _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &5557906192929727440
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab
@@ -384,6 +384,9 @@ MonoBehaviour:
  Gold: 0
  Exp: 0
  Score: 0
+  _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3}
+  _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3}
+  _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3}
 --- !u!1 &6732329482384499360
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab
@@ -380,6 +380,12 @@ MonoBehaviour:
  firePoint: {fileID: 3571909985532505043}
  attackCollider: {fileID: 3772826248857896723}
  rb: {fileID: 4986202531950816680}
+  mpRecoveryRate: 1
+  mpRecoveryInterval: 3
+  isRecovering: 0
+  _attackSound: {fileID: 8300000, guid: 3aa1c6aa8a0b2c24487dde9a48e1d6da, type: 3}
+  _deathSound: {fileID: 8300000, guid: d5e7610e90cfd054b9c1fc1fef110d91, type: 3}
+  _hitSound: {fileID: 8300000, guid: 365990a793283564aa391eddb2dc2c76, type: 3}
 --- !u!1 &6930308287002930140
 GameObject:
  m_ObjectHideFlags: 0
--- a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab
@@ -349,6 +349,12 @@ MonoBehaviour:
  firePoint: {fileID: 3204799031628172313}
  attackCollider: {fileID: 5093782900058509363}
  rb: {fileID: 4986202531950816680}
+  mpRecoveryRate: 1
+  mpRecoveryInterval: 3
+  isRecovering: 0
+  _attackSound: {fileID: 8300000, guid: 3aa1c6aa8a0b2c24487dde9a48e1d6da, type: 3}
+  _deathSound: {fileID: 8300000, guid: d5e7610e90cfd054b9c1fc1fef110d91, type: 3}
+  _hitSound: {fileID: 8300000, guid: 365990a793283564aa391eddb2dc2c76, type: 3}
 --- !u!1 &4475587780921916628
 GameObject:
  m_ObjectHideFlags: 0