Skip to content
This repository has been archived by the owner on Oct 12, 2021. It is now read-only.

Commit

Permalink
Fix dialog tweener
Browse files Browse the repository at this point in the history
  • Loading branch information
elct9620 committed Aug 21, 2019
1 parent fe9ce31 commit 555ab3c
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 3 deletions.
4 changes: 1 addition & 3 deletions Dockerfile-client
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ RUN patch -p0 < patches/import_csv_data.rb.patch \
# For direct test game
&& patch -p0 < patches/disable_encrypt.patch \
# For compile client with SQLite
&& patch -p0 < patches/compile/001_create_const_data.rb.patch \
&& patch -p0 < patches/compile/002_ProfoundNoticePanel.as.patch \
&& patch -p0 < patches/compile/003_text_tweener.patch
&& find patches/compile -type f | xargs cat | patch -p0

# Add user customize content
ADD customize/ /app
Expand Down
55 changes: 55 additions & 0 deletions patches/compile/004_dialog_tweener.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
--- client/src/view/scene/common/StoryTextField.as
+++ client/src/view/scene/common/StoryTextField.as
@@ -98,6 +98,7 @@ package view.scene.common
private var _initFunc:Function;

private var _titleHtml:String;
+ private var _scroller:DialogScroll;


/**
@@ -173,6 +174,8 @@ package view.scene.common
_maskBitmap = new Bitmap(_maskBitmapData);
_textAreaBitmap = new Bitmap(_textAreaBitmapData);
_maskBitmap.scrollRect = new Rectangle(0,0,width,_visibleHeight)
+ _scroller = new DialogScroll(_maskBitmap);
+
log.writeLog(log.LV_FATAL, this, "setBitmap end");
}

@@ -200,7 +203,7 @@ package view.scene.common
// 移動量
var lineNum:int = Math.abs(_infoLines[line][0] - _maskBitmap.scrollRect.y);
log.writeLog(log.LV_FATAL, this, "Scrolling to ",line,lineNum,_infoLines[line][0]);
- return new TweenerThread(_maskBitmap, {_scrollRect_y: _infoLines[line][0], transition:"easeOutCirc", time:0.0005*lineNum+0.0002})
+ return new TweenerThread(_scroller, {scrollTop: _infoLines[line][0], transition:"easeOutCirc", time:0.0005*lineNum+0.0002})
}

// 自動スクロールするスレッド
@@ -238,6 +241,26 @@ package view.scene.common
}
}

+class DialogScroll {
+ private var _scrollTop:Number = 0.0;
+ private var _mask:Bitmap;
+
+ public function DialogScroll(mask:Bitmap) {
+ _mask = mask;
+ }
+
+ public function get scrollTop():Number {
+ return _scrollTop;
+ }
+
+ public function set scrollTop(value:Number):void {
+ _scrollTop = value;
+ var rect:Rectangle = _mask.scrollRect;
+ rect.y = _scrollTop
+ _mask.scrollRect = rect
+ }
+}
+
import flash.display.*;
import flash.geom.*;
import flash.text.*;

0 comments on commit 555ab3c

Please sign in to comment.