Browse Source

var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem) 替代 var currentLocation = this.model.heroLocations[this.director.currentItem[0]]

xzw 3 years ago
parent
commit
e27b3e8c13
2 changed files with 6 additions and 4 deletions
  1. 2 2
      js/main_2020_edit.js
  2. 4 2
      js/main_2020_show.js

+ 2 - 2
js/main_2020_edit.js

@@ -19285,7 +19285,7 @@ function o(a, s, l) {
                 var a = new P.Euler
                   , s = new P.Vector3;
                 H.debug("Starting wait: " + (void 0 !== t));
-                var currentLocation = this.model.heroLocations[this.director.currentItem[0]] 
+                var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)//this.model.heroLocations[this.director.currentItem[0]] 
                 var l = currentLocation.dontRot || this.calcBurnsAmount(e)
                   , c = function() {
                     this.endWarpState(),
@@ -22379,7 +22379,7 @@ function o(a, s, l) {
                 var defaultRotTime = DATA.tourRotTime * 1000
                 var timeEachItem = 2e3 / (DATA.tourWalkSpeed + DATA.tourBlackSpeed) * 200 //预估时间假设每个item飞的时间(如果距离远就少了)
                  
-                var currentLocation = this.model.heroLocations[this.director.currentItem[0]] 
+                var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)
                 var rotTime
                 if(currentLocation.rotTime == void 0 || currentLocation.rotTime == ''){
                     var restChildCount = currentLocation.heroLocations ? (currentLocation.heroLocations.length-this.director.currentItem[1]-1) : 0

+ 4 - 2
js/main_2020_show.js

@@ -20241,7 +20241,7 @@ window.Modernizr = function(n, e, t) {
                   , o = new r.Vector3;
                 y.debug("Starting wait: " + (void 0 !== t));
                 
-                var currentLocation = this.model.heroLocations[this.director.currentItem[0]] 
+                var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)//this.model.heroLocations[this.director.currentItem[0]] 
                 var s = currentLocation.dontRot || this.calcBurnsAmount(e)
                   , h = function() {
                     this.endWarpState(),
@@ -23605,7 +23605,9 @@ window.Modernizr = function(n, e, t) {
                 var defaultRotTime = DATA.tourRotTime * 1000
                 var timeEachItem = 2e3 / (DATA.tourWalkSpeed + DATA.tourBlackSpeed) * 200 //预估时间假设每个item飞的时间(如果距离远就少了)
                  
-                var currentLocation = this.model.heroLocations[this.director.currentItem[0]] 
+                //var currentLocation = this.model.heroLocations[this.director.currentItem[0]] 
+                var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)
+                
                 var rotTime
                 if(currentLocation.rotTime == void 0 || currentLocation.rotTime == ''){
                     var restChildCount = currentLocation.heroLocations ? (currentLocation.heroLocations.length-this.director.currentItem[1]-1) : 0