Skip to content

X
xiaoxiaole
Commit 000cbcd3 authored by 邱旭's avatar 邱旭
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents f7d71764 2861f099
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 998 additions and 121 deletions
egret/resource/TextureMerger/common.tmproject
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
\ No newline at end of file
<<<<<<< HEAD
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
=======
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png","../assets/common/prizePanelbg.png","../assets/common/common_prizelight.png","../assets/common/common_yuanbao.png"]}
>>>>>>> 0930
egret/resource/TextureMerger/h5.tmproject
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"h5","version":5,"files":["../assets/shop/按钮 副本.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"h5","version":5,"files":["../assets/h5/h5btn.png","../assets/h5/h5_gobtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/invite.tmproject
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_rule_bg.png","../assets/invite/invite_prize_btn.png","../assets/invite/invite_prize_bg.png","../assets/invite/invite_prize_ad.png","../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png","../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/cutTime/invateCut_bg.png","../assets/invite/cutTime/invateCut_btn.png","../assets/invite/invite_wx_tip.png"]}
\ No newline at end of file
egret/resource/TextureMerger/inviterule.tmproject 0 → 100644
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"inviterule","version":5,"files":["../assets/inviterule/inviterulebg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/map.tmproject
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png"]}
\ No newline at end of file
<<<<<<< HEAD
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png"]}
=======
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png","../assets/map/音乐关闭.png","../assets/map/声音关闭.png","../assets/map/recordbtn.png","../assets/map/msgTri.png","../assets/map/guideOver.png","../assets/map/guideLove.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideMoney.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png"]}
>>>>>>> 0930
egret/resource/TextureMerger/startpanel.tmproject
View file @ 000cbcd3
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ice1.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png"]}
egret/resource/assets/share2.jpg
View replaced file @ f7d71764 View file @ 000cbcd3
egret/resource/assets/share2.jpg

114 KB | W: | H:

egret/resource/assets/share2.jpg

145 KB | W: | H:

egret/resource/assets/share2.jpg
egret/resource/assets/share2.jpg
egret/resource/assets/share2.jpg
egret/resource/assets/share2.jpg
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/share3.jpg
View replaced file @ f7d71764 View file @ 000cbcd3
egret/resource/assets/share3.jpg

196 KB | W: | H:

egret/resource/assets/share3.jpg

121 KB | W: | H:

egret/resource/assets/share3.jpg
egret/resource/assets/share3.jpg
egret/resource/assets/share3.jpg
egret/resource/assets/share3.jpg
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.thm.json
View file @ 000cbcd3
{
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/ADSkin.exml",
"resource/skins/InviteRuleSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/BagSkin.exml",
"resource/skins/Blood2Skin.exml",
"resource/skins/BloodSkin.exml",
"resource/skins/Box2Skin.exml",
"resource/skins/BoxSkin.exml",
"resource/skins/Buy1Skin.exml",
"resource/skins/Buy2Skin.exml",
"resource/skins/Buy3Skin.exml",
"resource/skins/ExchangeSkin.exml",
"resource/skins/FailSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/H5Skin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/Main2Skin.exml",
"resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml",
"resource/skins/MapSkin.exml",
"resource/skins/MapTopSkin.exml",
"resource/skins/NoPrizeSkin.exml",
"resource/skins/OptionItemSkin.exml",
"resource/skins/OptionsSkin.exml",
"resource/skins/PlaySkin.exml",
"resource/skins/Prize2Skin.exml",
"resource/skins/PrizeSkin.exml",
"resource/skins/QuitSkin.exml",
"resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml",
"resource/skins/ReliveSkin.exml",
"resource/skins/RuleSkin.exml",
"resource/skins/Share2Skin.exml",
"resource/skins/ShareSkin.exml",
"resource/skins/ShareTipsSkin.exml",
"resource/skins/ShopSkin.exml",
"resource/skins/ShowOffSkin.exml",
"resource/skins/SignItemSkin.exml",
"resource/skins/SignPrizeSkin.exml",
"resource/skins/SignSkin.exml",
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/ToastSkin.exml",
"resource/skins/VScrollBarSkin.exml"
],
"path": "resource/default.thm.json"
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/BagSkin.exml",
"resource/skins/Blood2Skin.exml",
"resource/skins/BloodSkin.exml",
"resource/skins/Box2Skin.exml",
"resource/skins/BoxSkin.exml",
"resource/skins/Buy1Skin.exml",
"resource/skins/Buy2Skin.exml",
"resource/skins/Buy3Skin.exml",
"resource/skins/ExchangeSkin.exml",
"resource/skins/FailSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/H5Skin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/InviteRuleSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/Main2Skin.exml",
"resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml",
"resource/skins/MapSkin.exml",
"resource/skins/MapTopSkin.exml",
"resource/skins/NoPrizeSkin.exml",
"resource/skins/OptionItemSkin.exml",
"resource/skins/OptionsSkin.exml",
"resource/skins/PlaySkin.exml",
"resource/skins/Prize2Skin.exml",
"resource/skins/PrizeSkin.exml",
"resource/skins/QuitSkin.exml",
"resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml",
"resource/skins/ReliveSkin.exml",
"resource/skins/RuleSkin.exml",
"resource/skins/Share2Skin.exml",
"resource/skins/ShareSkin.exml",
"resource/skins/ShareTipsSkin.exml",
"resource/skins/ShopSkin.exml",
"resource/skins/ShowOffSkin.exml",
"resource/skins/SignItemSkin.exml",
"resource/skins/SignPrizeSkin.exml",
"resource/skins/SignSkin.exml",
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/ToastSkin.exml",
"resource/skins/VScrollBarSkin.exml"
],
"path": "resource/default.thm.json"
}
\ No newline at end of file
egret/src/mainScene/GameGuide.ts
View file @ 000cbcd3
......@@ -415,6 +415,33 @@ const chapterFuns = {
"被困住的元素无法进行移动，当触发元素\n消除时，元素上的藤蔓即可被消除"
]
},
//果冻消除
81: {
elementTypes: [
0, 0, 0, 4, 5, 2, 0, 0, 0,
0, 0, 4, 5, 3, 4, 1, 0, 0,
0, 5, 5, 4, 4, 1, 4, 2, 0,
3, 2, 1, 5, 4, 3, 1, 4, 5,
4, 3, 5, 4, 2, 3, 1, 3, 4,
1, 2, 2, 1, 3, 2, 2, 5, 3,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
5, 2, 3, 1, 0, 3, 5, 5, 1
],
stepCount: 1,
showIndexs: [
[32, 41, 50, 49],
],
hideIndexs: [
[32, 41],
],
handIndexs: [
[49, 50]
],
msg: [
"当果冻附近的元素产生消除时，即可消除果冻\n不消除果冻时，果冻会逐渐蔓延"
]
},
}
/**
......
egret/src/mainScene/MainScene.ts
View file @ 000cbcd3
......@@ -219,9 +219,9 @@ export default class MainScene extends Scene {
super.start();
//第几关
this.chapter = (data && data.chapter) ? data.chapter : 1;
this.chapter = 81;
// this.chapter = 81;
this.chapterTxt.text = "第" + this.chapter + "关";
//关卡数据,1期定制，70,后面35关地图一致，步数减少
//关卡数据
var mapDataIndex = this.chapter;
//56到70的话，中间36到50
if (this.chapter >= 56 && this.chapter <= 70) {
......@@ -286,7 +286,7 @@ export default class MainScene extends Scene {
AiControl.ins.init(this.lattices);
//游戏引导
const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24]
const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24, 81]
if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
if (!readCache(getCacheKey() + this.chapter)) {
this.gameGuide = new GameGuide(this);
......@@ -593,6 +593,16 @@ export default class MainScene extends Scene {
}
// this.lattices[11].element.effectType=EffectType.MAGICLION;
// this.lattices[20].element.effectType=EffectType.MAGICLION;
var bbb = [];
for (var a = 0; a < this.lattices.length; a++) {
var lat = this.lattices[a];
if (lat && lat.element && lat.element.type <= 4) {
bbb.push(lat.element.type + 1);
} else {
bbb.push(0)
}
}
console.log(bbb);
//初始化完先检测死图
this.warningCop = Tool.dieMapCheck(this.lattices);
......@@ -1813,6 +1823,8 @@ export default class MainScene extends Scene {
//石头
else if (ele.type == ElementType.ROCK) {
this.removeRock(index);
//算个数
this.goElementTarget(ele);
}
//果冻
else if (ele.type == ElementType.JELLY) {
......@@ -2468,6 +2480,7 @@ export default class MainScene extends Scene {
arr[i].touchEnabled = b;
arr[i].touchChildren = b;
}
this.quitBtn.touchEnabled = b;
this.enableTouch = b;
}
sample() {
......
egret/src/shareCtrl.ts
View file @ 000cbcd3
......@@ -60,13 +60,13 @@ class Share2 extends ComponentBase {
// else
// base64= getPrintScreenData(this['pic' + this.type], 0, 0, 600, 965);
// NetManager.ins.imgUrl((success) => {
// const data = DataManager.ins.getData('imgURL');
// img.src = base64;
// img.src = data.data;
if(this.type == 1)
callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare.jpg', channel);
else
callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
// const data = DataManager.ins.getData('imgURL');
// img.src = base64;
// img.src = data.data;
if(this.type==1)
callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare2.jpg', channel);
else
callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
// }, base64);
}
......
egret/src/something/Chapters.ts
View file @ 000cbcd3
This diff is collapsed.
egret/src/something/logic/AiControl.ts
View file @ 000cbcd3
......@@ -239,7 +239,8 @@ function judgeSpread(index: number, lattices: Lattice[]): number {
var i = arr.splice(rand, 1)[0];
if (lattices[i] &&
lattices[i].element &&
lattices[i].element.type <= 4) {
lattices[i].element.type <= 4&&
!lattices[i].element.isLock) {
return i
}
}
......
mock/happyclear/home.json
View file @ 000cbcd3
......@@ -511,15 +511,15 @@
"remainProp": [
{
"type": 2,
"num": 0
"num": 2
},
{
"type": 3,
"num": 0
"num": 2
},
{
"type": 4,
"num": 0
"num": 2
}
],
"remainEnargy": 99,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment