|
@@ -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
|