diff --git a/Platformer/Assets/Prefabs/WBullet.prefab b/Platformer/Assets/Prefabs/WBullet.prefab index c78af4d..0929148 100644 --- a/Platformer/Assets/Prefabs/WBullet.prefab +++ b/Platformer/Assets/Prefabs/WBullet.prefab @@ -72,7 +72,7 @@ SpriteRenderer: m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: fd4c92d791035cb4d8aa033c01be9047, type: 3} - m_Color: {r: 0.45531535, g: 0.11992703, b: 0.5188679, a: 1} + m_Color: {r: 1, g: 0, b: 0.70006275, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -134,3 +134,4 @@ MonoBehaviour: speed: 10 bullet: {fileID: 572020582100483421} rb: {fileID: 2431741317804212671} + direction: 0 diff --git a/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs b/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs index 0942311..edc5800 100644 --- a/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs +++ b/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs @@ -18,8 +18,8 @@ public class Weapon : MonoBehaviour public float attackRange = .05f; //circular range public LayerMask enemyLayers; //only hits the enemies on enemy layer public int attackDamage = 30; //sword damage - public float attackRate = 2.75f;//attack rate per second - float nextAttackTime = .05f;//next attack time + public float attackRate = 1.5f;//attack rate per second + float nextAttackTime = .25f;//next attack time void Update() diff --git a/Platformer/Assets/_Scenes/Level1.unity b/Platformer/Assets/_Scenes/Level1.unity index 9d963ae..c200c2b 100644 --- a/Platformer/Assets/_Scenes/Level1.unity +++ b/Platformer/Assets/_Scenes/Level1.unity @@ -484143,7 +484143,7 @@ MonoBehaviour: lookAheadDstX: 2.5 lookSmoothTimeX: 0.5 verticalSmoothTime: 0 - focusAreaSize: {x: 4, y: 5} + focusAreaSize: {x: 4, y: 6} --- !u!20 &519420031 Camera: m_ObjectHideFlags: 0 @@ -1004164,7 +1004164,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1131811346} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -15.05, y: 0, z: 0} + m_LocalPosition: {x: 0.8, y: 0, z: 0} m_LocalScale: {x: 1.2375, y: 1, z: 1} m_Children: [] m_Father: {fileID: 920754279} @@ -1004180,7 +1004180,7 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 1.1287566, y: 18.393639} @@ -1022840,8 +1022840,8 @@ MonoBehaviour: Knight4: {fileID: 1684384561} wallSlideSpeedMax: 10 wallStickTime: 0.1 - wallJumpClimb: {x: 7.5, y: 12} - wallJumpOff: {x: 7.5, y: 7} + wallJumpClimb: {x: 8.5, y: 12} + wallJumpOff: {x: 8.5, y: 7} wallLeap: {x: 10, y: 9} maxJumpHeight: 4.35 minJumpHeight: 1 @@ -1022997,7 +1022997,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 2048 attackDamage: 30 - attackRate: 2 + attackRate: 1.5 ShurikenAmount: {fileID: 1094364015} --- !u!114 &1919620933 MonoBehaviour: diff --git a/Platformer/Builds/Final/Build/Final.data.unityweb b/Platformer/Builds/Final/Build/Build/Build.data.unityweb similarity index 70% rename from Platformer/Builds/Final/Build/Final.data.unityweb rename to Platformer/Builds/Final/Build/Build/Build.data.unityweb index cb82d73..34f6169 100644 Binary files a/Platformer/Builds/Final/Build/Final.data.unityweb and b/Platformer/Builds/Final/Build/Build/Build.data.unityweb differ diff --git a/Platformer/Builds/Final/Build/Final.json b/Platformer/Builds/Final/Build/Build/Build.json similarity index 69% rename from Platformer/Builds/Final/Build/Final.json rename to Platformer/Builds/Final/Build/Build/Build.json index 7097baf..c5e0a20 100644 --- a/Platformer/Builds/Final/Build/Final.json +++ b/Platformer/Builds/Final/Build/Build/Build.json @@ -1,9 +1,9 @@ { "companyName": "DefaultCompany", "productName": "Platformer", -"dataUrl": "Final.data.unityweb", -"wasmCodeUrl": "Final.wasm.code.unityweb", -"wasmFrameworkUrl": "Final.wasm.framework.unityweb", +"dataUrl": "Build.data.unityweb", +"wasmCodeUrl": "Build.wasm.code.unityweb", +"wasmFrameworkUrl": "Build.wasm.framework.unityweb", "TOTAL_MEMORY": 268435456, "graphicsAPI": ["WebGL 2.0", "WebGL 1.0"], "webglContextAttributes": {"preserveDrawingBuffer": false}, diff --git a/Platformer/Builds/Final/Build/Build/Build.wasm.code.unityweb b/Platformer/Builds/Final/Build/Build/Build.wasm.code.unityweb new file mode 100644 index 0000000..5258392 Binary files /dev/null and b/Platformer/Builds/Final/Build/Build/Build.wasm.code.unityweb differ diff --git a/Platformer/Builds/Final/Build/Build/Build.wasm.framework.unityweb b/Platformer/Builds/Final/Build/Build/Build.wasm.framework.unityweb new file mode 100644 index 0000000..5fc05ec Binary files /dev/null and b/Platformer/Builds/Final/Build/Build/Build.wasm.framework.unityweb differ diff --git a/Platformer/Builds/Final/Build/UnityLoader.js b/Platformer/Builds/Final/Build/Build/UnityLoader.js similarity index 100% rename from Platformer/Builds/Final/Build/UnityLoader.js rename to Platformer/Builds/Final/Build/Build/UnityLoader.js diff --git a/Platformer/Builds/Final/Build/Final.wasm.code.unityweb b/Platformer/Builds/Final/Build/Final.wasm.code.unityweb deleted file mode 100644 index c5c9f3f..0000000 Binary files a/Platformer/Builds/Final/Build/Final.wasm.code.unityweb and /dev/null differ diff --git a/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb b/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb deleted file mode 100644 index 26cb94b..0000000 Binary files a/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb and /dev/null differ diff --git a/Platformer/Builds/Final/TemplateData/UnityProgress.js b/Platformer/Builds/Final/Build/TemplateData/UnityProgress.js similarity index 100% rename from Platformer/Builds/Final/TemplateData/UnityProgress.js rename to Platformer/Builds/Final/Build/TemplateData/UnityProgress.js diff --git a/Platformer/Builds/Final/TemplateData/favicon.ico b/Platformer/Builds/Final/Build/TemplateData/favicon.ico similarity index 100% rename from Platformer/Builds/Final/TemplateData/favicon.ico rename to Platformer/Builds/Final/Build/TemplateData/favicon.ico diff --git a/Platformer/Builds/Final/TemplateData/fullscreen.png b/Platformer/Builds/Final/Build/TemplateData/fullscreen.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/fullscreen.png rename to Platformer/Builds/Final/Build/TemplateData/fullscreen.png diff --git a/Platformer/Builds/Final/TemplateData/progressEmpty.Dark.png b/Platformer/Builds/Final/Build/TemplateData/progressEmpty.Dark.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressEmpty.Dark.png rename to Platformer/Builds/Final/Build/TemplateData/progressEmpty.Dark.png diff --git a/Platformer/Builds/Final/TemplateData/progressEmpty.Light.png b/Platformer/Builds/Final/Build/TemplateData/progressEmpty.Light.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressEmpty.Light.png rename to Platformer/Builds/Final/Build/TemplateData/progressEmpty.Light.png diff --git a/Platformer/Builds/Final/TemplateData/progressFull.Dark.png b/Platformer/Builds/Final/Build/TemplateData/progressFull.Dark.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressFull.Dark.png rename to Platformer/Builds/Final/Build/TemplateData/progressFull.Dark.png diff --git a/Platformer/Builds/Final/TemplateData/progressFull.Light.png b/Platformer/Builds/Final/Build/TemplateData/progressFull.Light.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressFull.Light.png rename to Platformer/Builds/Final/Build/TemplateData/progressFull.Light.png diff --git a/Platformer/Builds/Final/TemplateData/progressLogo.Dark.png b/Platformer/Builds/Final/Build/TemplateData/progressLogo.Dark.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressLogo.Dark.png rename to Platformer/Builds/Final/Build/TemplateData/progressLogo.Dark.png diff --git a/Platformer/Builds/Final/TemplateData/progressLogo.Light.png b/Platformer/Builds/Final/Build/TemplateData/progressLogo.Light.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/progressLogo.Light.png rename to Platformer/Builds/Final/Build/TemplateData/progressLogo.Light.png diff --git a/Platformer/Builds/Final/TemplateData/style.css b/Platformer/Builds/Final/Build/TemplateData/style.css similarity index 100% rename from Platformer/Builds/Final/TemplateData/style.css rename to Platformer/Builds/Final/Build/TemplateData/style.css diff --git a/Platformer/Builds/Final/TemplateData/webgl-logo.png b/Platformer/Builds/Final/Build/TemplateData/webgl-logo.png similarity index 100% rename from Platformer/Builds/Final/TemplateData/webgl-logo.png rename to Platformer/Builds/Final/Build/TemplateData/webgl-logo.png diff --git a/Platformer/Builds/Final/Build/index.html b/Platformer/Builds/Final/Build/index.html new file mode 100644 index 0000000..4f65a5e --- /dev/null +++ b/Platformer/Builds/Final/Build/index.html @@ -0,0 +1,25 @@ + + + + + + Unity WebGL Player | Platformer + + + + + + + +
+
+ +
+ +