|
@@ -96,6 +96,14 @@ export class dai_dao_ju_bag extends Component {
|
|
if(this.mScrollView!=null){
|
|
if(this.mScrollView!=null){
|
|
this.action_node.position = this.mScrollView.position;
|
|
this.action_node.position = this.mScrollView.position;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(this.cur_select_item!=null){
|
|
|
|
+ if(!this.cur_select_item.isZero()){
|
|
|
|
+ this.EnabledScroll(false)
|
|
|
|
+ }else{
|
|
|
|
+ this.EnabledScroll(true)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -124,8 +132,10 @@ export class dai_dao_ju_bag extends Component {
|
|
}
|
|
}
|
|
|
|
|
|
onItemFinish(item:bag_drag_item){
|
|
onItemFinish(item:bag_drag_item){
|
|
- item.node.removeFromParent()
|
|
|
|
this.cur_select_item = null;
|
|
this.cur_select_item = null;
|
|
|
|
+ item.DeleteSelf()
|
|
|
|
+ this.action_node.off(Node.EventType.TOUCH_START)
|
|
|
|
+ this.btn_info.active = false;
|
|
if(this.isFinishAll()){
|
|
if(this.isFinishAll()){
|
|
if( this.mData.finish_event_id!=-1){
|
|
if( this.mData.finish_event_id!=-1){
|
|
gameManager.Singleton.exeEvent(this.mData.finish_event_id)
|
|
gameManager.Singleton.exeEvent(this.mData.finish_event_id)
|
|
@@ -146,6 +156,10 @@ export class dai_dao_ju_bag extends Component {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ EnabledScroll(enabled:boolean){
|
|
|
|
+ this.content.parent.parent.getComponent(ScrollView).enabled = enabled;
|
|
|
|
+ }
|
|
|
|
+
|
|
addDragRect(r:Rect){
|
|
addDragRect(r:Rect){
|
|
// this.drag_des.position = new Vec3(r.x+r.width*0.5,r.y+r.height*0.5);
|
|
// this.drag_des.position = new Vec3(r.x+r.width*0.5,r.y+r.height*0.5);
|
|
// this.drag_des.getComponent(UITransform).setContentSize(new Size(r.width,r.height))
|
|
// this.drag_des.getComponent(UITransform).setContentSize(new Size(r.width,r.height))
|