Skip to content

Commit bb66aeb

Browse files
zhulu-mikezhulu-mike
committed
11
11
1 parent 7e3c6fd commit bb66aeb

File tree

23 files changed

+574
-247
lines changed

23 files changed

+574
-247
lines changed

‎ImageSourceEditor/src/ImageEdit.mxml

+57-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
2626
import vo.DirectoryVO;
2727
28+
29+
30+
31+
2832
private var allDirectory:Vector.<DirectoryVO> = new Vector.<DirectoryVO>();//所有的目录
2933
3034
private var fileTotal:int = 0; //要加载的文件个数
@@ -61,6 +65,8 @@
6165
initEvent();
6266
6367
loadConfig();
68+
69+
ctrlPanel.playBtn.addEventListener(MouseEvent.CLICK, playAni);
6470
}
6571
6672
/**加载配置XML,用于存储资源文件的时间和注册点信息，方便下次使用，还未完成*/
@@ -157,6 +163,7 @@
157163
158164
private function onDrop(event:NativeDragEvent):void
159165
{
166+
timer.stop();
160167
this.clear();
161168
var arr:Array = event.clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
162169
var file:File = new File(arr[0].nativePath);
@@ -204,6 +211,7 @@
204211
*/
205212
private function importSourcesFile(event:MouseEvent):void
206213
{
214+
timer.stop();
207215
this.clear();
208216
209217
var fl:File = File.desktopDirectory;
@@ -308,7 +316,7 @@
308316
readDirectory(allDirectory[i]);
309317
if (i == 0)
310318
{
311-
ctrlPanel.intervalTime_textInput.text = ConfigHelper.getConfig(allDirectory[i].fileName) ? ConfigHelper.getConfig(allDirectory[i].fileName).time : "67";
319+
ctrlPanel.intervalTime_textInput.text = ConfigHelper.getConfig(allDirectory[i].fileName) ? ConfigHelper.getConfig(allDirectory[i].fileName).time : "100";
312320
}
313321
}
314322
}
@@ -425,6 +433,7 @@
425433
426434
private function createAllNewImages(event:MouseEvent):void
427435
{
436+
timer.stop();
428437
swfPacker.registerPoint = ctrlPanel.xValue.selected ? 0 : ctrlPanel.yValue.selected ? 1 : 2;
429438
if(ctrlPanel.xValue.selected == true)
430439
{
@@ -442,6 +451,7 @@
442451
443452
private function clear():void
444453
{
454+
timer.stop();
445455
this.allDirectory = new Vector.<DirectoryVO>();
446456
this.isAddToStage = false;
447457
this.loadIndex = 0;
@@ -455,6 +465,52 @@
455465
this.registerDot.y = int(ctrlPanel.yPos.text);
456466
this.setShadowXY();
457467
}
468+
469+
private function playAni(e:MouseEvent):void
470+
{
471+
timer.stop();
472+
playIndex = 0;
473+
if (allDirectory.length < 1 || allDirectory[0].imgArr.length < 1)
474+
{
475+
Alert.show("请先导入资源文件");
476+
return;
477+
}
478+
playImgs = allDirectory[0].imgArr[4].tempArr as Array;
479+
var i:int = 0, len:int = playImgs.length;
480+
var arr:Array = [], nameArr:Array;
481+
for (;i<len;i++)
482+
{
483+
nameArr = playImgs[i].name.split("_");
484+
if (nameArr[0] == 0)
485+
{
486+
arr.push({index:int(nameArr[1]),img:playImgs[i]});
487+
}
488+
}
489+
arr.sortOn("index", Array.NUMERIC);
490+
playImgs = arr;
491+
timer.delay = int(ctrlPanel.intervalTime_textInput.text);
492+
timer.addEventListener(TimerEvent.TIMER, onTimer);
493+
timer.start();
494+
}
495+
496+
private function onTimer(e:TimerEvent):void
497+
{
498+
if (playImgs.length > playIndex)
499+
{
500+
while(sta.numChildren > 0)
501+
{
502+
sta.removeElementAt(0);
503+
}
504+
sta.addElement(playImgs[playIndex].img);
505+
playIndex++;
506+
}else{
507+
playIndex = 0;
508+
}
509+
}
510+
511+
private var timer:Timer = new Timer(30);
512+
private var playImgs:Array;
513+
private var playIndex:int = 0;
458514
]]>
459515
</fx:Script>
460516

‎ImageSourceEditor/src/com/leman/SwfPacker.as

+2
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,8 @@ package com.leman
424424
{
425425
if (last == -1){
426426
last = actionImages[i].r;
427+
if (len == 1)
428+
arr.push([actionImages[0]]);
427429
}else if (actionImages[i].r != last || i == len - 1)
428430
{
429431
arr.push(actionImages.slice(begin,i == len - 1 ? len : i));

‎ImageSourceEditor/src/com/leman/view/ControlPanel.mxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<s:Button id="outXML" label="清理" />
138138

139139
<s:CheckBox id="checkBox" label="显示人物参考模型"/>
140-
<s:Label color="#FFFFFF"/>
140+
<s:Button id="playBtn" label="播放"/>
141141

142142
<s:RadioButton id="xValue" width="100" label="默认点" selected="false"/>
143143
<s:RadioButton id="yValue" label="中心点" selected="false"/>
@@ -149,7 +149,7 @@
149149
<s:Label text="时间间隔类型：" paddingTop="5" textAlign="center" width="100"/>
150150
<s:DropDownList id="comboBox" dataProvider="{this.timeSetData}" width="100" selectedIndex="0" change="updateTimeInterval()"/>
151151
<s:Label text="两帧间隔时间：" paddingTop="5" textAlign="center" visible="{intervalTime_textInput.visible}" includeInLayout="{intervalTime_textInput.visible}"/>
152-
<s:TextInput id="intervalTime_textInput" text="67" color="#FFFFFF" restrict="0-9 ." width="100" includeInLayout="{intervalTime_textInput.visible}"/>
152+
<s:TextInput id="intervalTime_textInput" text="100" color="#FFFFFF" restrict="0-9 ." width="100" includeInLayout="{intervalTime_textInput.visible}"/>
153153
</s:Group>
154154
<s:Group id="actionTimePanel" includeInLayout="{actionTimePanel.visible}" visible="false" color="0xff0000" direction="ltr">
155155
<s:layout>

‎corelib/src/com/thinkido/framework/common/sound/SoundThread.as

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@
206206
else
207207
{
208208
// $sound = $sound.toLowerCase();
209-
re1 = new RegExp("^.+.mp3$");
210-
re2 = new RegExp("^.+.wmv$");
209+
re1 = new RegExp("^.+.mp3");
210+
re2 = new RegExp("^.+.wmv");
211211
str1True = re1.test($sound);
212212
str2True = re2.test($sound);
213213
if (str1True || str2True)

‎corelib/src/com/thinkido/framework/common/utils/dirty/DirtyBoundsMaker.as

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
this.add( nodePool.createObj(LNode,bound) as LNode, lNode.pre);
6464
return;
6565
}
66-
if (lBound.intersects(bound))
66+
_interBounds = lBound.intersection(bound);
67+
if (_interBounds)
6768
{
68-
_interBounds = lBound.intersection(bound);
6969
if (_interBounds.equals(bound))
7070
{
7171
Bounds.deleteBounds(bound);
@@ -87,7 +87,7 @@
8787
_unionBounds = lBound.union(bound);
8888
this.remove(lNode);
8989
this.beginLN = this.first;
90-
Bounds.deleteBounds(bound);
90+
// Bounds.deleteBounds(bound);
9191
if (this.beginLN != null)
9292
{
9393
this.addBounds(_unionBounds);
@@ -97,7 +97,7 @@
9797
this.add(new LNode(_unionBounds), this.last);
9898
}
9999
}
100-
Bounds.deleteBounds(_interBounds);
100+
// Bounds.deleteBounds(_interBounds);
101101
return;
102102
}
103103
lNode = lNode.next;

‎corelib/src/com/thinkido/framework/engine/Scene.as

+11-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.thinkido.framework.engine.staticdata.AvatarPartType;
1616
import com.thinkido.framework.engine.staticdata.SceneCharacterType;
1717
import com.thinkido.framework.engine.tools.SceneCache;
18+
import com.thinkido.framework.engine.utils.Astar;
1819
import com.thinkido.framework.engine.vo.ShowContainer;
1920
import com.thinkido.framework.engine.vo.avatar.AvatarParamData;
2021
import com.thinkido.framework.utils.DrawUtil;
@@ -25,6 +26,7 @@
2526
import flash.events.Event;
2627
import flash.geom.Point;
2728
import flash.utils.ByteArray;
29+
import flash.utils.getTimer;
2830

2931
import org.osflash.thunderbolt.Logger;
3032

@@ -395,7 +397,7 @@
395397
var sc:SceneCharacter = null;
396398
mapConfig = $mapConfig;
397399
SceneCache.mapTiles = $mapTile;
398-
SceneCache.mapSolidsByte = $mapSolid;
400+
Astar.starGrid.grids = $mapSolid;
399401
if (mapConfig.slipcovers != null && mapConfig.slipcovers.length > 0)
400402
{
401403
for each (slipcover in mapConfig.slipcovers)
@@ -697,7 +699,6 @@
697699
SceneCache.mapImgCache.dispose();
698700
SceneCache.currentMapZones = {};
699701
SceneCache.mapTiles = {};
700-
SceneCache.mapSolidsByte.clear();
701702
SceneCache.mapZones = {};
702703
this.mapConfig = null;
703704
this.sceneSmallMapLayer.dispose();
@@ -713,6 +714,7 @@
713714
if (sc != this.mainChar && sc != this._mouseChar)
714715
{
715716
this.removeCharacter(sc);
717+
trace(getTimer());
716718
continue;
717719
}
718720
index++;
@@ -881,7 +883,7 @@
881883
var $x:int = floor($point.x / MAX_AVATARBD_WIDTH);
882884
var $y:int = floor($point.y / MAX_AVATARBD_HEIGHT);
883885
var bmd:BitmapData = this.sceneAvatarLayer.getAvatarBD($x, $y);
884-
if (this.sceneAvatarLayer.getAvatarBD($x, $y) != null)
886+
if (bmd != null)
885887
{
886888
color = bmd.getPixel32($point.x - $x * MAX_AVATARBD_WIDTH, $point.y - $y * MAX_AVATARBD_HEIGHT);
887889
if (color != 0)
@@ -955,7 +957,7 @@
955957
{
956958
var i:int = 0, j:int = 0, offset:int = 0;
957959
var deep:int = 1, index:int = 0, gridx:int = mapConfig.mapGridX, gridy:int = mapConfig.mapGridY;
958-
var tar:ByteArray = SceneCache.mapSolidsByte;
960+
var tar:ByteArray = Astar.starGrid.grids;
959961
var newX:int = 0, newY:int = 0;
960962
while((p.x + deep < gridx || p.x - deep >= 0 || p.y + deep < gridy || p.y - deep >= 0))
961963
{
@@ -983,5 +985,10 @@
983985
}
984986
return null;
985987
}
988+
989+
public function isMouseChar(sc:SceneCharacter):Boolean
990+
{
991+
return sc == _mouseChar;
992+
}
986993
}
987994
}

‎corelib/src/com/thinkido/framework/engine/SceneCharacter.as

+10
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,16 @@
417417
MagicHelper.showMagic_from1pass1toPointArea(this, $toP, $fromApd, $toApd, $passApd);
418418
return;
419419
}
420+
421+
/**
422+
* @see MagicHelper#showMagic_from1pass1toPointArea
423+
*
424+
*/
425+
public function showMagic_from1pass1toPoint_NoPath($toP:Point, $fromApd:AvatarParamData = null, $toApd:AvatarParamData = null, $passApd:AvatarParamData = null) : void
426+
{
427+
MagicHelper.showMagic_from1pass1toPoint_NoPath(this, $toP, $fromApd, $toApd, $passApd);
428+
return;
429+
}
420430

421431
public function showMagic_from1pass1toRectArea(value1:Point, value2:int, value3:int, value4:int = 1, value5:Boolean = true, value6:AvatarParamData = null, value7:AvatarParamData = null, value8:AvatarParamData = null) : void
422432
{

‎corelib/src/com/thinkido/framework/engine/config/MapConfig.as

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.thinkido.framework.engine.config
22
{
3+
import flash.geom.Rectangle;
34

45
public class MapConfig extends Object
56
{
@@ -29,6 +30,11 @@
2930
*/
3031
public var smallMapUrl:String;
3132
public var slipcovers:Array;
33+
34+
/**
35+
* 安全区
36+
*/
37+
public var safeRect:Rectangle = new Rectangle();
3238

3339
public function MapConfig()
3440
{

‎corelib/src/com/thinkido/framework/engine/graphics/avatar/AvatarPart.as

+10-25
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.thinkido.framework.engine.vo.avatar.AvatarPartStatus;
2323
import com.thinkido.framework.engine.vo.avatar.AvatarPlayCallBack;
2424
import com.thinkido.framework.engine.vo.avatar.AvatarPlayCondition;
25-
import com.thinkido.framework.engine.vo.avatar.XmlImgData;
2625
import com.thinkido.framework.engine.vo.avatar.DynamicPosition.IDynamicPosition;
26+
import com.thinkido.framework.engine.vo.avatar.XmlImgData;
2727
import com.thinkido.framework.manager.TimerManager;
2828

2929
import flash.display.BitmapData;
@@ -294,7 +294,7 @@
294294
this.setStatus(CharStatusType.STAND);
295295
}else if (type == AvatarPartType.WING)
296296
{
297-
if ( _currentStatus != CharStatusType.DEATH)
297+
if ( $status != CharStatusType.DEATH)
298298
setStatus( CharStatusType.STAND );
299299
else
300300
setStatus( $status);
@@ -355,17 +355,12 @@
355355
}
356356
if (this._currentStatus == CharStatusType.DEATH)
357357
{
358-
// this._currentLogicAngel = 0;
359358
this._only1LogicAngel = false ;
360359
}
361360
if (CharStatusType.isOnly1Repeat(this._currentStatus))
362361
{
363362
this._only1Repeat = true;
364363
}
365-
// if (this.type == AvatarPartType.MAGIC_PASS)
366-
// {
367-
// this._only1Frame = true;
368-
// }
369364
if (this.type == AvatarPartType.MAGIC_PASS || this.type == AvatarPartType.MAGIC)
370365
{
371366
this._autoRecycle = true;
@@ -400,23 +395,8 @@
400395
{
401396
_changed = true;
402397
}
403-
// if (_tempInView != this.avatar.sceneCharacter.inViewDistance())
404-
// {
405-
// //可见状态发生变化时，也要更新
406-
// _changed = true;
407-
// _tempViewChanged = true;
408-
// }
409398
if (_changed)
410399
{
411-
//此处如果加入_tempViewChanged视野的改变优化。当切换场景时，服务端的数据在加载场景完毕之前，由于重设主角
412-
//SC的setLogicAngle，此时由于SC的inViewDistance返回的是false，会导致旧图像销毁，但是新的图像不会生产
413-
//从而导致切换场景后主角不可见的bug。
414-
//BUG的解决办法:
415-
//1:在加载新场景时，inViewDistance方法始终返回true(暂时用这个)
416-
//2.在if (_tempInView != this.avatar.sceneCharacter.inViewDistance())逻辑中对oldData.inView也赋值，但是此办法
417-
//依然会导致进入场景后如果人物不动时无法看到形象
418-
//3.如果场景被dispose后，不进入uninstallAvatarImg逻辑
419-
// if (_tempStatus != this._currentStatus || _tempViewChanged)
420400
if (_tempStatus != this._currentStatus)
421401
{
422402
this._lastTime = 0;
@@ -677,7 +657,7 @@
677657
this.cutRect.height = this._drawSourceBitmapData.height;
678658
this._sourcePoint.x = 0;
679659
this._sourcePoint.y = 0;
680-
trace("旋转用时："+(getTimer()-tt));
660+
// trace("旋转用时："+(getTimer()-tt));
681661
}
682662
else if (this._drawMouseOn && this.avatar.sceneCharacter.isMouseOn)//如果为true，加滤镜
683663
{
@@ -1011,8 +991,12 @@
1011991
var bd:BitmapData = this._inMaskDrawSourceBitmapData || this._drawSourceBitmapData;
1012992
if (bd != null)
1013993
{
1014-
_color = bd.getPixel32($p.x - this.cutRect.x + this._sourcePoint.x, $p.y - this.cutRect.y + this._sourcePoint.y);
1015-
if (_color != 0)
994+
try{
995+
_color = bd.getPixel32($p.x - this.cutRect.x + this._sourcePoint.x, $p.y - this.cutRect.y + this._sourcePoint.y);
996+
}catch(e:Error){
997+
trace("what's reason cause error!");
998+
}
999+
if (_color != 0)
10161000
{
10171001
return true;
10181002
}
@@ -1121,6 +1105,7 @@
11211105
this._offsetOnMountX = this._avatarParamData.offsetOnMountX;
11221106
this._offsetOnMountY = this._avatarParamData.offsetOnMountY;
11231107
this._dynamicPosition = this._avatarParamData.dynamicPosition;
1108+
this._currentRotation = this._avatarParamData.rotation ;
11241109
this._sleepTime = this._avatarParamData.sleepTime;
11251110
this._useSpecilizeXY = this._avatarParamData.useSpecilizeXY;
11261111
var apcb:AvatarPlayCallBack = this._avatarParamData.playCallBack;

0 commit comments

Comments
 (0)