diff --git a/Assets/ResWork/Ingame/NonCrashShield.png.meta b/Assets/ResWork/Ingame/NonCrashShield.png.meta index 939ac0c..7e70db0 100644 --- a/Assets/ResWork/Ingame/NonCrashShield.png.meta +++ b/Assets/ResWork/Ingame/NonCrashShield.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 70 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/ResWork/Ingame/NormalShield_Noraml.png.meta b/Assets/ResWork/Ingame/NormalShield_Noraml.png.meta index b905511..50a331a 100644 --- a/Assets/ResWork/Ingame/NormalShield_Noraml.png.meta +++ b/Assets/ResWork/Ingame/NormalShield_Noraml.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 60 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/ResWork/Table/Export/Monster.json b/Assets/ResWork/Table/Export/Monster.json index 725f708..98c746c 100644 --- a/Assets/ResWork/Table/Export/Monster.json +++ b/Assets/ResWork/Table/Export/Monster.json @@ -1 +1 @@ -[{"n_MonsterTypeID":"2001","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"25","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.6","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2001","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2002","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"1.2","e_MoveType":"Static","n_ProjectileID":"3201","s_MonsterPrefabPath":"2002","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"1","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2003","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"200","n_DropExp":"3","e_UnityType":"Melee","f_AttackRange":"2","f_AttackDelay":"1.5","f_MoveSpeed":"0.25","e_MoveType":"Random","n_ProjectileID":"3101","s_MonsterPrefabPath":"2003","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"5","n_InvinityShieldCount":"1"},{"n_MonsterTypeID":"2004","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"25","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2004","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2005","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"0.82","e_MoveType":"Static","n_ProjectileID":"3201","s_MonsterPrefabPath":"2005","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"1","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2006","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"200","n_DropExp":"3","e_UnityType":"Range","f_AttackRange":"4.5","f_AttackDelay":"1.5","f_MoveSpeed":"0.2","e_MoveType":"Random","n_ProjectileID":"3201","s_MonsterPrefabPath":"2006","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"8","n_InvinityShieldCount":"1"}] \ No newline at end of file +[{"n_MonsterTypeID":"2001","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"25","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2001","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2002","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"0.3","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2002","f_Scale":"0.15","e_ShieldType":"Rotation","n_NormalShieldCount":"2","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2003","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"200","n_DropExp":"3","e_UnityType":"Melee","f_AttackRange":"2","f_AttackDelay":"1.5","f_MoveSpeed":"0.25","e_MoveType":"Random","n_ProjectileID":"3101","s_MonsterPrefabPath":"2003","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"6","n_InvinityShieldCount":"2"},{"n_MonsterTypeID":"2004","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"25","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2004","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2005","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"0.7","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2005","f_Scale":"0.15","e_ShieldType":"Rotation","n_NormalShieldCount":"0","n_InvinityShieldCount":"1"},{"n_MonsterTypeID":"2006","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"200","n_DropExp":"3","e_UnityType":"Range","f_AttackRange":"4.5","f_AttackDelay":"1.5","f_MoveSpeed":"0.2","e_MoveType":"Random","n_ProjectileID":"3102","s_MonsterPrefabPath":"2006","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"8","n_InvinityShieldCount":"2"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/Projectile.json b/Assets/ResWork/Table/Export/Projectile.json index 520124f..f09f7f9 100644 --- a/Assets/ResWork/Table/Export/Projectile.json +++ b/Assets/ResWork/Table/Export/Projectile.json @@ -1 +1 @@ -[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"Effect/ArrowHit","f_ProjectileSpeed":"2","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","n_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"Projectile_MobRange","s_HitEffect":"","f_ProjectileSpeed":"3","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3201","s_ProjectilePrefabs":"P_electric","s_HitEffect":"Hit_electric","f_ProjectileSpeed":"3.5","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"},{"n_ProjectileID":"3301","s_ProjectilePrefabs":"FX_Cartoon Thunder","s_HitEffect":"","f_ProjectileSpeed":"0","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"}] \ No newline at end of file +[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"Effect/ArrowHit","f_ProjectileSpeed":"2","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","n_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"P_electric","s_HitEffect":"Hit_electric","f_ProjectileSpeed":"3","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3201","s_ProjectilePrefabs":"P_electric","s_HitEffect":"Hit_electric","f_ProjectileSpeed":"3.5","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"},{"n_ProjectileID":"3301","s_ProjectilePrefabs":"FX_Cartoon Thunder","s_HitEffect":"","f_ProjectileSpeed":"0","n_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0.1"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/Unit.json b/Assets/ResWork/Table/Export/Unit.json index 5878f56..609f3cf 100644 --- a/Assets/ResWork/Table/Export/Unit.json +++ b/Assets/ResWork/Table/Export/Unit.json @@ -1 +1 @@ -[{"n_UnitID":"1001","n_DefaultAttack":"15","n_DefaultHp":"999999","f_AttackSpeed":"1.25","n_DefaultProjectileCount":"1","n_ProjectileID":"3001","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file +[{"n_UnitID":"1001","n_DefaultAttack":"15","n_DefaultHp":"999999","f_AttackSpeed":"2.15","n_DefaultProjectileCount":"1","n_ProjectileID":"3001","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index 66c9402..ddb8593 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/Resources/Mob/2003.prefab b/Assets/Resources/Mob/2003.prefab index 793b693..8837687 100644 --- a/Assets/Resources/Mob/2003.prefab +++ b/Assets/Resources/Mob/2003.prefab @@ -1731,7 +1731,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95cfc8ede5a97ff40974f55cacd46e17, type: 3} m_Name: m_EditorClassIdentifier: - rotateSpeed: 180 + rotateSpeed: 60 --- !u!1001 &1795299342052770711 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Mob/2006.prefab b/Assets/Resources/Mob/2006.prefab index 86c367d..2eb9909 100644 --- a/Assets/Resources/Mob/2006.prefab +++ b/Assets/Resources/Mob/2006.prefab @@ -2941,7 +2941,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95cfc8ede5a97ff40974f55cacd46e17, type: 3} m_Name: m_EditorClassIdentifier: - rotateSpeed: 180 + rotateSpeed: 120 --- !u!1001 &2807251004949950631 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Mob/MobShield.prefab b/Assets/Resources/Mob/MobShield.prefab index 50129d1..a4e680d 100644 --- a/Assets/Resources/Mob/MobShield.prefab +++ b/Assets/Resources/Mob/MobShield.prefab @@ -29,7 +29,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -143,7 +143,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.92, y: 1.92} + oldSize: {x: 9.6, y: 9.6} newSize: {x: 1.92, y: 1.92} adaptiveTilingThreshold: 0.5 drawMode: 0 diff --git a/Assets/Resources/Supporter/Supporter.prefab b/Assets/Resources/Supporter/Supporter.prefab index dd1423d..00aed33 100644 --- a/Assets/Resources/Supporter/Supporter.prefab +++ b/Assets/Resources/Supporter/Supporter.prefab @@ -546,7 +546,7 @@ Transform: m_GameObject: {fileID: 497443208249652342} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.2, y: 0, z: 0} + m_LocalPosition: {x: -3.2, y: 100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: