Add files via upload

wizard1146 · Apr 25, 2024 · 82440b0 · 82440b0
1 parent b3a0d8f
commit 82440b0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/js/mg3.canvas.js b/js/mg3.canvas.js
@@ -252,6 +252,21 @@ mg3.canvas = (function() {
 
     if (hero) {
       // move the hero first
+      /*
+      let h = units[hero.id]
+      let c = h.anim.current
+      if (h.actual.position.x == hero.x && h.actual.position.z == hero.y) {
+        if (h.anim.current != h.anim.keys.idle) {
+          h.anim.current = h.anim.keys.idle
+          h.AnimateIdle()
+        }
+      } else {
+        if (h.anim.current != h.anim.keys.walk) {
+          h.anim.current = h.anim.keys.walk
+          h.AnimateWalk()
+        }
+      }*/
+
       units[hero.id]?.moveTo( hero.x, hero.y )
     }
     if (rest && rest.length) {
@@ -282,7 +297,7 @@ mg3.canvas = (function() {
     if (datum.isPlayer) {
       let sc = settings.canvas
       eye = new BABYLON.ArcFollowCamera( sc.id_eye, sc.alpha, sc.beta, sc.radius, unit.actual, scene )
-      scene.setActiveCameraByID( sc.id_eye )
+      //scene.setActiveCameraByID( sc.id_eye )
     }
     // notify Comptroller
     raiseEvent( canvas, events.canvas.unit_loaded, unit )

diff --git a/js/mg3.engine.js b/js/mg3.engine.js
@@ -160,7 +160,7 @@ mg3.engine = (function() {
     // generate map
 
     // generate player
-    let datum  = UNITS['sentinel'] // MODIFY
+    let datum  = UNITS['player'] // MODIFY
     let player = generateUnit( datum.key, datum, true )
     data.hero = player
 

diff --git a/js/mg3.season.001.js b/js/mg3.season.001.js
@@ -221,8 +221,6 @@ mg3.season_001 = (function(){
       walk : `003_run_weaponshield`,
     },
   })
-
- // HRM
   UNITS[`ethnic`] = new Unit({
     key: `ethnic`,
     uri: `ethnic_hero`,
@@ -232,6 +230,17 @@ mg3.season_001 = (function(){
       walk : `001_run_samurai_f`,
     },
   })
+
+  // Player
+  UNITS[`player`] = new Unit({
+    key: `player`,
+    uri: `ssp`,
+    scale: 1.22,
+    animationKeys: {
+      idle: `idle`,
+      walk: `walk`,
+    },
+  })
 
   return {
     LEVELS: LEVELS,