Skip to content

Commit

Permalink
更新公共库
Browse files Browse the repository at this point in the history
  • Loading branch information
Willis-Zhou committed Sep 16, 2020
1 parent b95a81d commit ae3fcd4
Show file tree
Hide file tree
Showing 75 changed files with 4,134 additions and 5,271 deletions.
1 change: 0 additions & 1 deletion bin/game/GameScene.json

This file was deleted.

1 change: 0 additions & 1 deletion bin/loading/LoadingScene.json

This file was deleted.

1 change: 1 addition & 0 deletions bin/prefab/ad/flowAd_WithName.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":160,"presetID":1,"name":"flowAd_WithName","mouseThrough":true,"mouseEnabled":true,"isPresetRoot":true,"height":200},"compId":614,"child":[{"type":"List","props":{"y":0,"x":0,"top":0,"spaceY":10,"spaceX":0,"right":0,"repeatX":1,"presetID":12,"name":"list","left":0,"elasticEnabled":false,"bottom":0},"compId":629},{"type":"Script","props":{"y":0,"x":0,"presetID":13,"newTagPath":"ad/new_tag2.png","nameCfg":"26||24||ffffff","maxOnShowCells":1,"isHorizontal":false,"isCanDynamicChange":false,"imgWidth":152,"imgHeight":152,"iconPos":"4|4","iconNeedPos":true,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/wx/ad_frame_4.png","delayToLoad":0,"cellWidth":160,"cellHeight":169,"advType":"list","advKey":"Flow","advCount":1,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":630},{"type":"Script","props":{"y":0,"x":0,"presetID":14,"runtime":"script/game/ui/popup/Flow.js"},"compId":631}],"loadList":["ad/new_tag2.png","ad/hot_tag2.png","ad/wx/ad_frame_4.png"],"loadList3D":[]}
2 changes: 1 addition & 1 deletion bin/prefab/ad/oppo/moreGameAd.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":1,"name":"moreGameAd","mouseEnabled":true,"isPresetRoot":true,"height":1334},"compId":256,"child":[{"type":"Button","props":{"y":667,"x":375,"width":750,"top":0,"stateNum":1,"skin":"ad/transparent_btn.png","right":0,"presetID":13,"name":"closeBtn","left":0,"height":1334,"bottom":0,"anchorY":0.5,"anchorX":0.5},"compId":628},{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":14,"name":"root","mouseThrough":true,"height":1334},"compId":629,"child":[{"type":"Image","props":{"y":667,"x":0,"width":165,"skin":"ad/popup_ad_frame2.png","sizeGrid":"40,40,40,40","presetID":2,"pivotY":356,"name":"adLoader","mouseThrough":false,"height":712,"centerY":0},"compId":273,"child":[{"type":"List","props":{"y":91,"x":11.5,"width":138,"spaceY":20,"spaceX":0,"repeatY":4,"repeatX":1,"presetID":4,"name":"list","height":612,"elasticEnabled":false},"compId":424},{"type":"Script","props":{"showName":true,"presetID":6,"newTagPath":"ad/new_tag2.png","maxOnShowCells":12,"maxCells":12,"isTween":false,"isHorizontal":false,"isCanDynamicChange":false,"imgWidth":138,"imgHeight":138,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/oppo/ad_frame_2.png","delayToLoad":0,"cellWidth":138,"cellHeight":138,"advType":"list","advKey":"Popup","advCount":12,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":425},{"type":"Script","props":{"y":0,"x":0,"verticalCenter":490,"presetID":11,"isAlignVerticalCenter":true,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":514}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":15,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":630}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":10,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":513},{"type":"Script","props":{"y":0,"x":0,"rootNode":"@node:629","rootName":"adLoader","presetID":12,"openType":"fromLeft","closeType":"none","runtime":"script/game/ui/popup/MoreGamePopup.js"},"compId":518}],"loadList":["ad/transparent_btn.png","ad/popup_ad_frame2.png","ad/new_tag2.png","ad/hot_tag2.png","ad/oppo/ad_frame_2.png"],"loadList3D":[]}
{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":1,"name":"moreGameAd","mouseEnabled":true,"isPresetRoot":true,"height":1334},"compId":256,"child":[{"type":"Button","props":{"y":667,"x":375,"width":750,"top":0,"stateNum":1,"skin":"ad/transparent_btn.png","right":0,"presetID":13,"name":"closeBtn","left":0,"height":1334,"bottom":0,"anchorY":0.5,"anchorX":0.5},"compId":628},{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":14,"name":"root","mouseThrough":true,"height":1334},"compId":629,"child":[{"type":"Image","props":{"y":667,"x":0,"width":165,"skin":"ad/popup_ad_frame2.png","sizeGrid":"40,40,40,40","presetID":2,"pivotY":356,"name":"adLoader","mouseThrough":false,"height":712,"centerY":0},"compId":273,"child":[{"type":"List","props":{"y":91,"x":11.5,"width":138,"spaceY":20,"spaceX":0,"repeatY":4,"repeatX":1,"presetID":4,"name":"list","height":612,"elasticEnabled":false},"compId":424},{"type":"Script","props":{"showName":true,"presetID":6,"newTagPath":"ad/new_tag2.png","maxOnShowCells":12,"maxCells":12,"isTween":false,"isHorizontal":false,"isCanDynamicChange":false,"imgWidth":138,"imgHeight":138,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/oppo/ad_frame_2.png","delayToLoad":0,"cellWidth":138,"cellHeight":138,"advType":"list","advKey":"Popup","advCount":12,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":425}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":15,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":630}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":10,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":513},{"type":"Script","props":{"y":0,"x":0,"rootNode":"@node:629","rootName":"adLoader","presetID":12,"openType":"fromLeft","closeType":"none","runtime":"script/game/ui/popup/MoreGamePopup.js"},"compId":518}],"loadList":["ad/transparent_btn.png","ad/popup_ad_frame2.png","ad/new_tag2.png","ad/hot_tag2.png","ad/oppo/ad_frame_2.png"],"loadList3D":[]}
2 changes: 1 addition & 1 deletion bin/prefab/ad/ov/flowNativeAd_750x230.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":1,"name":"flowNativeAd","isPresetRoot":true,"height":230},"compId":87,"child":[{"type":"Image","props":{"top":0,"skin":"ad/vivo/flow_default_size.png","sizeGrid":"20,20,20,20","right":0,"presetID":2,"name":"bg","left":0,"bottom":0},"compId":97,"child":[{"type":"Button","props":{"y":115,"x":375,"width":750,"stateNum":1,"skin":"ad/ov/flow_default_size.png","presetID":28,"pivotY":115,"pivotX":375,"name":"clickBtn","height":230},"compId":1040},{"type":"Button","props":{"y":20,"x":20,"width":40,"stateNum":1,"skin":"ad/ov/insert_ad_close_btn.png","presetID":3,"pivotY":20,"pivotX":20,"name":"closeBtn","height":40},"compId":98},{"type":"Image","props":{"width":83,"skin":"ad/ov/insert_ad_logo.png","scaleY":0.8,"scaleX":0.8,"right":0,"presetID":26,"pivotY":31,"pivotX":83,"name":"logo","height":31,"bottom":0},"compId":1038}]},{"type":"Script","props":{"presetID":27,"runtime":"script/game/ui/popup/NativeFlow.js"},"compId":1039}],"loadList":["ad/vivo/flow_default_size.png","ad/ov/flow_default_size.png","ad/ov/insert_ad_close_btn.png","ad/ov/insert_ad_logo.png"],"loadList3D":[]}
{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":1,"name":"flowNativeAd","isPresetRoot":true,"height":230},"compId":87,"child":[{"type":"Image","props":{"top":0,"skin":"ad/ov/flow_default_size.png","sizeGrid":"20,20,20,20","right":0,"presetID":2,"name":"bg","left":0,"bottom":0},"compId":97,"child":[{"type":"Button","props":{"y":115,"x":375,"width":750,"stateNum":1,"skin":"ad/ov/flow_default_size.png","presetID":28,"pivotY":115,"pivotX":375,"name":"clickBtn","height":230},"compId":1040},{"type":"Button","props":{"y":20,"x":20,"width":40,"stateNum":1,"skin":"ad/ov/insert_ad_close_btn.png","presetID":3,"pivotY":20,"pivotX":20,"name":"closeBtn","height":40},"compId":98},{"type":"Image","props":{"width":83,"skin":"ad/ov/insert_ad_logo.png","scaleY":0.8,"scaleX":0.8,"right":0,"presetID":26,"pivotY":31,"pivotX":83,"name":"logo","height":31,"bottom":0},"compId":1038}]},{"type":"Script","props":{"presetID":27,"runtime":"script/game/ui/popup/NativeFlow.js"},"compId":1039}],"loadList":["ad/ov/flow_default_size.png","ad/ov/insert_ad_close_btn.png","ad/ov/insert_ad_logo.png"],"loadList3D":[]}
2 changes: 1 addition & 1 deletion bin/prefab/ad/wx/scrollAd.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":750,"visible":true,"presetID":1,"name":"scrollAd","mouseThrough":true,"isPresetRoot":true,"height":1334},"compId":751,"child":[{"type":"Box","props":{"x":0,"right":0,"presetID":10,"name":"adLoader","mouseThrough":false,"left":0,"height":185,"bottom":35,"bgColor":"#ffffff"},"compId":753,"child":[{"type":"Image","props":{"width":750,"top":0,"skin":"ad/scroll_ad_bg.png","right":0,"presetID":12,"pivotY":93,"pivotX":375,"name":"bg","left":0,"height":185,"bottom":0},"compId":757},{"type":"List","props":{"spaceX":10,"right":0,"repeatY":1,"repeatX":5,"presetID":15,"name":"list","mouseEnabled":true,"left":0,"height":170,"elasticEnabled":true,"centerY":0,"anchorY":0.5,"anchorX":0.5},"compId":755},{"type":"Script","props":{"right":0,"presetID":21,"left":0,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":35,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":877},{"type":"Script","props":{"y":0,"x":0,"tweenSpeed":3000,"presetID":14,"newTagPath":"ad/new_tag2.png","maxOnShowCells":5,"isTween":true,"isHorizontal":true,"isCanDynamicChange":true,"imgWidth":170,"imgHeight":170,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/wx/ad_frame_6.png","fontColor":"#0d0d0d","delayToLoad":0,"cellWidth":170,"cellSize":110,"cellHeight":170,"advType":"list","advKey":"Scroll","advCount":12,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":756}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":23,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":885},{"type":"Script","props":{"y":0,"x":0,"presetID":22,"runtime":"script/game/ui/popup/ScrollPopup.js"},"compId":884}],"loadList":["ad/scroll_ad_bg.png","ad/new_tag2.png","ad/hot_tag2.png","ad/wx/ad_frame_6.png"],"loadList3D":[]}
{"type":"Box","props":{"y":0,"x":0,"width":750,"visible":true,"presetID":1,"name":"scrollAd","mouseThrough":true,"isPresetRoot":true,"height":1334},"compId":751,"child":[{"type":"Box","props":{"x":0,"right":0,"presetID":10,"name":"adLoader","mouseThrough":false,"left":0,"height":185,"bottom":0,"bgColor":"#ffffff"},"compId":753,"child":[{"type":"Image","props":{"width":750,"top":0,"skin":"ad/scroll_ad_bg.png","right":0,"presetID":12,"pivotY":93,"pivotX":375,"name":"bg","left":0,"height":185,"bottom":0},"compId":757},{"type":"List","props":{"spaceX":10,"right":0,"repeatY":1,"repeatX":5,"presetID":15,"name":"list","mouseEnabled":true,"left":0,"height":170,"elasticEnabled":true,"centerY":0,"anchorY":0.5,"anchorX":0.5},"compId":755},{"type":"Script","props":{"right":0,"presetID":21,"left":0,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":35,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":877},{"type":"Script","props":{"y":0,"x":0,"tweenSpeed":3000,"presetID":14,"newTagPath":"ad/new_tag2.png","maxOnShowCells":5,"isTween":true,"isHorizontal":true,"isCanDynamicChange":true,"imgWidth":170,"imgHeight":170,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/wx/ad_frame_6.png","fontColor":"#0d0d0d","delayToLoad":0,"cellWidth":170,"cellSize":110,"cellHeight":170,"advType":"list","advKey":"Scroll","advCount":12,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":756}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":23,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":885},{"type":"Script","props":{"y":0,"x":0,"presetID":22,"runtime":"script/game/ui/popup/ScrollPopup.js"},"compId":884}],"loadList":["ad/scroll_ad_bg.png","ad/new_tag2.png","ad/hot_tag2.png","ad/wx/ad_frame_6.png"],"loadList3D":[]}
1 change: 1 addition & 0 deletions bin/prefab/ad/wx/scrollAd_WithName.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":750,"visible":true,"presetID":1,"name":"scrollAd_WithName","mouseThrough":true,"isPresetRoot":true,"height":1334},"compId":751,"child":[{"type":"Box","props":{"x":0,"right":0,"presetID":10,"name":"adLoader","mouseThrough":false,"left":0,"height":215,"bottom":0,"bgColor":"#ffffff"},"compId":753,"child":[{"type":"Image","props":{"width":750,"top":0,"skin":"ad/scroll_ad_bg.png","right":0,"presetID":12,"pivotY":93,"pivotX":375,"name":"bg","left":0,"height":215,"bottom":0},"compId":757},{"type":"List","props":{"spaceX":10,"right":0,"repeatY":1,"repeatX":5,"presetID":15,"name":"list","mouseEnabled":true,"left":0,"height":204,"elasticEnabled":true,"centerY":0,"anchorY":0.5,"anchorX":0.5},"compId":755},{"type":"Script","props":{"right":0,"presetID":21,"left":0,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":35,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":877},{"type":"Script","props":{"y":0,"x":0,"tweenSpeed":3000,"presetID":14,"newTagPath":"ad/new_tag2.png","nameCfg":"26||8||000000","maxOnShowCells":5,"isTween":true,"isHorizontal":true,"isCanDynamicChange":true,"imgWidth":170,"imgHeight":170,"hotTagPath":"ad/hot_tag2.png","framePath":"ad/wx/ad_frame_6.png","fontColor":"#0d0d0d","delayToLoad":0,"cellWidth":170,"cellSize":110,"cellHeight":204,"advType":"list","advKey":"Scroll","advCount":12,"runtime":"script/game/ctrl/AdvLoadMgr.js"},"compId":756}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":23,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":885},{"type":"Script","props":{"y":0,"x":0,"presetID":22,"runtime":"script/game/ui/popup/ScrollPopup.js"},"compId":884}],"loadList":["ad/scroll_ad_bg.png","ad/new_tag2.png","ad/hot_tag2.png","ad/wx/ad_frame_6.png"],"loadList3D":[]}
1 change: 1 addition & 0 deletions bin/prefab/mistake/clickBox.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"Box","props":{"y":0,"x":0,"width":750,"presetID":1,"name":"clickBox","isPresetRoot":true,"height":1334,"bgColor":"#495db4"},"compId":793,"child":[{"type":"Image","props":{"width":600,"top":86,"skin":"mistake/clickBox/clickBox_title.png","presetID":7,"pivotX":300,"name":"title","height":82,"centerX":0},"compId":815},{"type":"Button","props":{"width":438,"stateNum":1,"skin":"mistake/clickBox/clickBox_icon.png","presetID":12,"pivotY":200,"pivotX":219,"name":"clickBtn","height":400,"centerY":0,"centerX":0},"compId":821},{"type":"Image","props":{"width":515,"top":244,"skin":"mistake/progress_bg.png","sizeGrid":"0,10,0,10","presetID":9,"pivotX":258,"name":"clickProgressBg","height":40,"centerX":0},"compId":817},{"type":"ProgressBar","props":{"width":515,"value":0.5,"top":244,"skin":"mistake/progress_fill.png","sizeGrid":"0,0,0,0,1","presetID":11,"pivotX":258,"name":"clickProgress","height":40,"centerX":0},"compId":818},{"type":"Image","props":{"width":143,"skin":"mistake/click_finger.png","presetID":14,"pivotY":59,"pivotX":72,"name":"finger","height":117,"centerY":59,"centerX":72},"compId":823,"child":[{"type":"Script","props":{"presetID":17,"duration":600,"runtime":"script/game/ctrl/AutoScale.js"},"compId":826}]},{"type":"Image","props":{"width":116,"skin":"mistake/click_tips.png","presetID":15,"pivotY":126,"name":"tips","height":126,"centerY":-233,"centerX":233},"compId":824,"child":[{"type":"Script","props":{"presetID":18,"duration":600,"runtime":"script/game/ctrl/AutoScale.js"},"compId":827}]},{"type":"Script","props":{"y":0,"x":0,"top":0,"right":0,"presetID":6,"left":0,"layoutParent":"stage","isAlignTop":true,"isAlignRight":true,"isAlignLeft":true,"isAlignBottom":true,"bottom":0,"runtime":"script/game/ctrl/WidgetMgr.js"},"compId":809},{"type":"Script","props":{"presetID":16,"invokeType":"appBox","runtime":"script/game/ui/popup/ClickPopup.js"},"compId":825}],"loadList":["mistake/clickBox/clickBox_title.png","mistake/clickBox/clickBox_icon.png","mistake/progress_bg.png","mistake/progress_fill.png","mistake/click_finger.png","mistake/click_tips.png"],"loadList3D":[]}
Loading

0 comments on commit ae3fcd4

Please sign in to comment.