Final Push

POOSH
aps16104 · May 6, 2020 · b3715e0 · b3715e0
1 parent cd95463
commit b3715e0
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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/...er/Builds/Final/Build/Final.data.unityweb → ...lds/Final/Build/Build/Build.data.unityweb b/...er/Builds/Final/Build/Final.data.unityweb → ...lds/Final/Build/Build/Build.data.unityweb
diff --git a/Platformer/Builds/Final/Build/Final.json → ...ormer/Builds/Final/Build/Build/Build.json b/Platformer/Builds/Final/Build/Final.json → ...ormer/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
diff --git a/Platformer/Builds/Final/Build/Build/Build.wasm.framework.unityweb b/Platformer/Builds/Final/Build/Build/Build.wasm.framework.unityweb
diff --git a/Platformer/Builds/Final/Build/UnityLoader.js → ...r/Builds/Final/Build/Build/UnityLoader.js b/Platformer/Builds/Final/Build/UnityLoader.js → ...r/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
diff --git a/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb b/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb
diff --git a/...uilds/Final/TemplateData/UnityProgress.js → ...Final/Build/TemplateData/UnityProgress.js b/...uilds/Final/TemplateData/UnityProgress.js → ...Final/Build/TemplateData/UnityProgress.js
diff --git a/...mer/Builds/Final/TemplateData/favicon.ico → ...ilds/Final/Build/TemplateData/favicon.ico b/...mer/Builds/Final/TemplateData/favicon.ico → ...ilds/Final/Build/TemplateData/favicon.ico
diff --git a/.../Builds/Final/TemplateData/fullscreen.png → ...s/Final/Build/TemplateData/fullscreen.png b/.../Builds/Final/TemplateData/fullscreen.png → ...s/Final/Build/TemplateData/fullscreen.png
diff --git a/...Final/TemplateData/progressEmpty.Dark.png → ...Build/TemplateData/progressEmpty.Dark.png b/...Final/TemplateData/progressEmpty.Dark.png → ...Build/TemplateData/progressEmpty.Dark.png
diff --git a/...inal/TemplateData/progressEmpty.Light.png → ...uild/TemplateData/progressEmpty.Light.png b/...inal/TemplateData/progressEmpty.Light.png → ...uild/TemplateData/progressEmpty.Light.png
diff --git a/.../Final/TemplateData/progressFull.Dark.png → .../Build/TemplateData/progressFull.Dark.png b/.../Final/TemplateData/progressFull.Dark.png → .../Build/TemplateData/progressFull.Dark.png
diff --git a/...Final/TemplateData/progressFull.Light.png → ...Build/TemplateData/progressFull.Light.png b/...Final/TemplateData/progressFull.Light.png → ...Build/TemplateData/progressFull.Light.png
diff --git a/.../Final/TemplateData/progressLogo.Dark.png → .../Build/TemplateData/progressLogo.Dark.png b/.../Final/TemplateData/progressLogo.Dark.png → .../Build/TemplateData/progressLogo.Dark.png
diff --git a/...Final/TemplateData/progressLogo.Light.png → ...Build/TemplateData/progressLogo.Light.png b/...Final/TemplateData/progressLogo.Light.png → ...Build/TemplateData/progressLogo.Light.png
diff --git a/...ormer/Builds/Final/TemplateData/style.css → ...Builds/Final/Build/TemplateData/style.css b/...ormer/Builds/Final/TemplateData/style.css → ...Builds/Final/Build/TemplateData/style.css
diff --git a/.../Builds/Final/TemplateData/webgl-logo.png → ...s/Final/Build/TemplateData/webgl-logo.png b/.../Builds/Final/TemplateData/webgl-logo.png → ...s/Final/Build/TemplateData/webgl-logo.png
diff --git a/Platformer/Builds/Final/Build/index.html b/Platformer/Builds/Final/Build/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | Platformer</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+    <script src="TemplateData/UnityProgress.js"></script>
+    <script src="Build/UnityLoader.js"></script>
+    <script>
+      var gameInstance = UnityLoader.instantiate("gameContainer", "Build/Build.json", {onProgress: UnityProgress});
+    </script>
+  </head>
+  <body>
+    <div class="webgl-content">
+      <div id="gameContainer" style="width: 960px; height: 600px"></div>
+      <div class="footer">
+        <div class="webgl-logo"></div>
+        <div class="fullscreen" onclick="gameInstance.SetFullscreen(1)"></div>
+        <div class="title">Platformer</div>
+      </div>
+    </div>
+  </body>
+</html>