diff --git a/assets/Scene/GuideScene.fire b/assets/Scene/GuideScene.fire index bec4c7d..acadf5f 100644 --- a/assets/Scene/GuideScene.fire +++ b/assets/Scene/GuideScene.fire @@ -1219,9 +1219,9 @@ "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 184, + "g": 138, + "b": 70, "a": 255 }, "_contentSize": { @@ -3533,7 +3533,7 @@ }, "component": "", "_componentId": "effe2nlNnBES4H9tFM4r38Z", - "handler": "click_Choice", + "handler": "click_Btn", "customEventData": "Btn_Hear" }, { @@ -4460,7 +4460,7 @@ }, "component": "", "_componentId": "effe2nlNnBES4H9tFM4r38Z", - "handler": "click_Choice", + "handler": "click_Btn", "customEventData": "Btn_New" }, { @@ -5387,7 +5387,7 @@ }, "component": "", "_componentId": "effe2nlNnBES4H9tFM4r38Z", - "handler": "click_Choice", + "handler": "click_Btn", "customEventData": "Btn_See" }, { diff --git a/assets/Scene/LoadScene.fire b/assets/Scene/LoadScene.fire index ec4e1c4..063de3e 100644 --- a/assets/Scene/LoadScene.fire +++ b/assets/Scene/LoadScene.fire @@ -133,7 +133,9 @@ "__id__": 2 }, "_enabled": true, - "audioGameBgm0": null, + "audioGameBgm0": { + "__uuid__": "bef46737-c323-42ea-9ea7-7dc780b882b7" + }, "baishao_audio": { "__uuid__": "47388b59-bca9-4607-bdc1-1fc7ba079a12" }, @@ -203,6 +205,12 @@ "zhuye_audio": { "__uuid__": "9c9e6c09-6653-44b7-8a72-9eddc54c2425" }, + "err": { + "__uuid__": "1a1f7dc6-de93-494d-b7be-fe9203b41dc0" + }, + "yes": { + "__uuid__": "92f37348-24a6-465c-b74a-0afda604dc3d" + }, "_id": "c9svoY3rpPjLRVujzjU/12" }, { @@ -1272,7 +1280,7 @@ }, "_enabled": true, "localTest": false, - "clientTestVersion": "1.0.3", + "clientTestVersion": "1.2.1", "testVersion": { "__id__": 21 }, @@ -1286,7 +1294,9 @@ "__id__": 4 }, "_enabled": true, - "audioGameBgm0": null, + "audioGameBgm0": { + "__uuid__": "bef46737-c323-42ea-9ea7-7dc780b882b7" + }, "baishao_audio": { "__uuid__": "47388b59-bca9-4607-bdc1-1fc7ba079a12" }, @@ -1356,6 +1366,12 @@ "zhuye_audio": { "__uuid__": "9c9e6c09-6653-44b7-8a72-9eddc54c2425" }, + "err": { + "__uuid__": "1a1f7dc6-de93-494d-b7be-fe9203b41dc0" + }, + "yes": { + "__uuid__": "92f37348-24a6-465c-b74a-0afda604dc3d" + }, "_id": "c78uwvSdFH7oUk6WRJFjFe" } ] \ No newline at end of file diff --git a/assets/Scene/OverScene.fire b/assets/Scene/OverScene.fire index 5d99ff2..9250c53 100644 --- a/assets/Scene/OverScene.fire +++ b/assets/Scene/OverScene.fire @@ -1126,14 +1126,14 @@ "ctor": "Float64Array", "array": [ 0, - -348.726, + -315.467, 0, 0, 0, 0, 1, - 0.8, - 0.8, + 1, + 1, 0 ] }, @@ -1415,8 +1415,8 @@ 0, 0, 1, - 0.8, - 0.8, + 1, + 1, 0 ] }, diff --git a/assets/Scene/RankScene.fire b/assets/Scene/RankScene.fire index 24fe5af..b9de0e3 100644 --- a/assets/Scene/RankScene.fire +++ b/assets/Scene/RankScene.fire @@ -87,26 +87,26 @@ "__id__": 102 }, { - "__id__": 105 + "__id__": 106 }, { - "__id__": 140 + "__id__": 141 } ], "_active": true, "_components": [ - { - "__id__": 146 - }, { "__id__": 147 }, { "__id__": 148 + }, + { + "__id__": 149 } ], "_prefab": { - "__id__": 149 + "__id__": 150 }, "_opacity": 255, "_color": { @@ -3724,10 +3724,13 @@ "_components": [ { "__id__": 103 + }, + { + "__id__": 104 } ], "_prefab": { - "__id__": 104 + "__id__": 105 }, "_opacity": 255, "_color": { @@ -3810,6 +3813,33 @@ }, "_id": "3cEUZF+3RNUYwTQQpf9d/W" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 102 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 4, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": -2, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "d9kYhTG5dO1oZvrIgzsMbS" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -3830,32 +3860,32 @@ }, "_children": [ { - "__id__": 106 + "__id__": 107 }, { - "__id__": 115 + "__id__": 116 }, { - "__id__": 118 + "__id__": 119 }, { - "__id__": 129 + "__id__": 130 }, { - "__id__": 132 + "__id__": 133 }, { - "__id__": 135 + "__id__": 136 } ], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 139 } ], "_prefab": { - "__id__": 139 + "__id__": 140 }, "_opacity": 255, "_color": { @@ -3909,24 +3939,24 @@ "_name": "pic", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [ { - "__id__": 107 + "__id__": 108 }, { - "__id__": 110 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 114 } ], "_prefab": { - "__id__": 114 + "__id__": 115 }, "_opacity": 255, "_color": { @@ -3980,17 +4010,17 @@ "_name": "pic", "_objFlags": 0, "_parent": { - "__id__": 106 + "__id__": 107 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 109 } ], "_prefab": { - "__id__": 109 + "__id__": 110 }, "_opacity": 255, "_color": { @@ -4044,7 +4074,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 107 + "__id__": 108 }, "_enabled": true, "_materials": [ @@ -4087,17 +4117,17 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 106 + "__id__": 107 }, "_children": [], "_active": false, "_components": [ { - "__id__": 111 + "__id__": 112 } ], "_prefab": { - "__id__": 112 + "__id__": 113 }, "_opacity": 255, "_color": { @@ -4151,7 +4181,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 110 + "__id__": 111 }, "_enabled": true, "_materials": [ @@ -4194,7 +4224,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 106 + "__id__": 107 }, "_enabled": true, "_materials": [ @@ -4225,17 +4255,17 @@ "_name": "rankLab", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 117 } ], "_prefab": { - "__id__": 117 + "__id__": 118 }, "_opacity": 255, "_color": { @@ -4289,7 +4319,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 115 + "__id__": 116 }, "_enabled": true, "_materials": [ @@ -4333,23 +4363,23 @@ "_name": "rank", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [ { - "__id__": 119 + "__id__": 120 }, { - "__id__": 122 + "__id__": 123 }, { - "__id__": 125 + "__id__": 126 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 128 + "__id__": 129 }, "_opacity": 255, "_color": { @@ -4403,17 +4433,17 @@ "_name": "one", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 119 }, "_children": [], "_active": false, "_components": [ { - "__id__": 120 + "__id__": 121 } ], "_prefab": { - "__id__": 121 + "__id__": 122 }, "_opacity": 255, "_color": { @@ -4467,7 +4497,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 119 + "__id__": 120 }, "_enabled": true, "_materials": [ @@ -4512,17 +4542,17 @@ "_name": "two", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 119 }, "_children": [], "_active": false, "_components": [ { - "__id__": 123 + "__id__": 124 } ], "_prefab": { - "__id__": 124 + "__id__": 125 }, "_opacity": 255, "_color": { @@ -4576,7 +4606,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 122 + "__id__": 123 }, "_enabled": true, "_materials": [ @@ -4621,17 +4651,17 @@ "_name": "three", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 119 }, "_children": [], "_active": false, "_components": [ { - "__id__": 126 + "__id__": 127 } ], "_prefab": { - "__id__": 127 + "__id__": 128 }, "_opacity": 255, "_color": { @@ -4685,7 +4715,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 126 }, "_enabled": true, "_materials": [ @@ -4741,17 +4771,17 @@ "_name": "nameLab", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 131 } ], "_prefab": { - "__id__": 131 + "__id__": 132 }, "_opacity": 255, "_color": { @@ -4805,7 +4835,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 129 + "__id__": 130 }, "_enabled": true, "_materials": [ @@ -4849,17 +4879,17 @@ "_name": "totalLab", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 134 } ], "_prefab": { - "__id__": 134 + "__id__": 135 }, "_opacity": 255, "_color": { @@ -4913,7 +4943,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 132 + "__id__": 133 }, "_enabled": true, "_materials": [ @@ -4957,17 +4987,17 @@ "_name": "timeLab", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 106 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 137 } ], "_prefab": { - "__id__": 137 + "__id__": 138 }, "_opacity": 255, "_color": { @@ -5021,7 +5051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 135 + "__id__": 136 }, "_enabled": true, "_materials": [ @@ -5065,7 +5095,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 105 + "__id__": 106 }, "_enabled": true, "alignMode": 1, @@ -5108,18 +5138,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 141 - }, { "__id__": 142 }, { "__id__": 143 + }, + { + "__id__": 144 } ], "_prefab": { - "__id__": 145 + "__id__": 146 }, "_opacity": 255, "_color": { @@ -5173,7 +5203,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 140 + "__id__": 141 }, "_enabled": true, "_materials": [ @@ -5207,7 +5237,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 140 + "__id__": 141 }, "_enabled": true, "alignMode": 1, @@ -5234,7 +5264,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 140 + "__id__": 141 }, "_enabled": true, "_normalMaterial": null, @@ -5243,7 +5273,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 144 + "__id__": 145 } ], "_N$interactable": true, @@ -5378,10 +5408,10 @@ "__id__": 79 }, "selfNode": { - "__id__": 105 + "__id__": 106 }, "phone": { - "__id__": 108 + "__id__": 109 }, "_id": "81Iy69gIdCtp0UzAUPZ1+M" }, diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index a499171..629a99d 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -95,8 +95,8 @@ export default class GameManager extends cc.Component { let name = this.customData.item; //埋点数据设置 - cc.fx.GameConfig.CLICK_SET("round",cc.fx.GameConfig.GM_INFO.level); - cc.fx.GameConfig.CLICK_SET("levelConfig",cc.fx.GameConfig.GM_INFO.custom); + cc.fx.GameConfig.CLICK_SET("round",cc.fx.GameConfig.GM_INFO.level+1); + cc.fx.GameConfig.CLICK_SET("levelConfig",(cc.fx.GameConfig.GM_INFO.custom+1)); cc.fx.GameConfig.CLICK_SET("item",name); cc.fx.GameConfig.CLICK_SET("roundType",this.customData.type); @@ -135,10 +135,11 @@ export default class GameManager extends cc.Component { this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = true; this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = true; this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = true; - if(this.containsNanana(this.now_Food) == true){ + this.Btn_Firewood.getComponent(cc.Button).interactable = true; + // if(this.containsNanana(this.now_Food) == true){ // console.log("可以点火"); - this.Btn_Firewood.getComponent(cc.Button).interactable = true; - } + + // } this.timeNode.getChildByName("time").getComponent(cc.Sprite).fillRange = 0; this.needleTween = cc.tween(this.timeNode.getChildByName("needle")) @@ -148,13 +149,12 @@ export default class GameManager extends cc.Component { cc.tween(this.timeNode.getChildByName("time").getComponent(cc.Sprite)) .to(5,{fillRange:1}) .call(()=>{ - this.timeTween = null; this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_Firewood.getComponent(cc.Button).interactable = false; - this.setData(null); - this.nextLevel(); + this.click_Choice(null,null); + this.timeTween = null; }) .start(); } @@ -184,13 +184,15 @@ export default class GameManager extends cc.Component { this.result = -1; } } - + var tempNode = null; + if(data != null) tempNode = this[data] //设置按钮状态 - this.setBtnState(this[data],data); - //根据答题,设置上传数据 - this.setData(data); + this.setBtnState(tempNode,data); //获取反应时间 this.setTimeData(); + //根据答题,设置上传数据 + this.setData(data); + //进行下一关 this.nextLevel(); } @@ -198,11 +200,10 @@ export default class GameManager extends cc.Component { //点火按钮 click_Ignition(){ cc.fx.GameConfig.CLICK_SET("ignite",true); - if(this.customData.flamable == 0){ - // console.log("错误点火"); - } - else if(this.customData.flamable == 1){ - let igniteCount = cc.fx.GameConfig.CLICK_DATA.igniteCount + 1; + this.Btn_Firewood.getComponent(cc.Button).interactable = false; + if(this.containsNanana(this.now_Food) == true){ + let igniteCount = cc.fx.GameConfig.GM_INFO.igniteCount + 1; + cc.fx.GameConfig.GM_INFO_SET("igniteCount",igniteCount); cc.fx.GameConfig.CLICK_SET("igniteCount",igniteCount); this.Btn_Firewood.getChildByName("fireBg").active = true; this.Btn_Firewood.getChildByName("fire").active = true; @@ -212,6 +213,10 @@ export default class GameManager extends cc.Component { this.Btn_Firewood.getChildByName("fire").active = false; } }, 1050); + console.log("正确点火"); + } + else if(this.customData.flamable == 1){ + console.log("错误点火"); // console.log("正确点火"); } } @@ -227,6 +232,7 @@ export default class GameManager extends cc.Component { result = 2; this.foodAudioArray.splice(i,1); cc.fx.GameConfig.CLICK_SET("rightChoice",2); + console.log("听到过"); i = 10000; break; } @@ -239,6 +245,7 @@ export default class GameManager extends cc.Component { //如果图片里面有 result = 3; this.foodPicArray.splice(i,1); + console.log("看到过"); cc.fx.GameConfig.CLICK_SET("rightChoice",3); i = 10000; break; @@ -256,7 +263,8 @@ export default class GameManager extends cc.Component { } - if(result == -1){ + if(result != 2 && result != 3){ + console.log("没出险过"); cc.fx.GameConfig.CLICK_SET("rightChoice",1); } return result; @@ -266,9 +274,9 @@ export default class GameManager extends cc.Component { setTimeData(){ this.overTime = cc.fx.GameTool.getTime(); let time = this.overTime - this.startTime; - cc.fx.GameConfig.CLICK_SET("stepTime",time); //防止溢出 - if(time < 0 || time > 2500) time = 2500; + if(time < 0 || time > 5000) time = 5000; + cc.fx.GameConfig.CLICK_SET("stepTime",time); cc.fx.GameConfig.GM_INFO.stepTimeList += time; } @@ -277,23 +285,32 @@ export default class GameManager extends cc.Component { if(data == "Btn_New") this.choice = 1; else if(data == "Btn_Hear") this.choice = 2; else if(data == "Btn_See") this.choice = 3; - else if(data == null){ - this.choice = 0; + + if(data == null){ + this.choice = 0; } if(this.choice != cc.fx.GameConfig.CLICK_DATA.rightChoice){ - node.getChildByName("err").active = true; - node.getChildByName("correct").active = false; + if(node){ + cc.fx.AudioManager._instance.playEffect("err",null); + node.getChildByName("err").active = true; + node.getChildByName("correct").active = false; + } + } else{ - node.getChildByName("err").active = false; - node.getChildByName("correct").active = true; + if(node){ + cc.fx.AudioManager._instance.playEffect("yes",null); + node.getChildByName("err").active = false; + node.getChildByName("correct").active = true; + } + } - node.getChildByName("nomal").active = false; + if(node) node.getChildByName("nomal").active = false; + this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false; - this.Btn_Firewood.getComponent(cc.Button).interactable = false; } //下一轮 首先重置按钮状态 @@ -323,7 +340,7 @@ export default class GameManager extends cc.Component { this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false; this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false; - this.Btn_Firewood.getComponent(cc.Button).interactable = false; + // this.Btn_Firewood.getComponent(cc.Button).interactable = false; } //返回首页 @@ -361,7 +378,6 @@ export default class GameManager extends cc.Component { else if(data == null){ this.choice = 0; cc.fx.GameConfig.CLICK_SET("stepTime",5000); - cc.fx.GameConfig.GM_INFO.stepTimeList += 5000; } var jg = false; if(this.choice == cc.fx.GameConfig.CLICK_DATA.rightChoice){ diff --git a/assets/Script/GuideManager.ts b/assets/Script/GuideManager.ts index b5fd02b..3c4de9e 100644 --- a/assets/Script/GuideManager.ts +++ b/assets/Script/GuideManager.ts @@ -84,6 +84,7 @@ export default class GuideManager extends cc.Component { } passVoice(){ + cc.fx.AudioManager._instance.playMusicGame(); let voice = this.node.getChildByName("voiceTip"); voice.getChildByName("startBtn").getComponent(cc.Button).interactable = false; voice.getChildByName("playBtn").getComponent(cc.Button).interactable = false; @@ -131,14 +132,14 @@ export default class GuideManager extends cc.Component { .to(0.2,{opacity:0}) .call(() =>{ label.string = ""; - this.createCustom(); + this.nextLevel(); }) .start(); } this.custom += 1; } - createCustom(){ + nextLevel(){ this.choice = 0; this.Btn_Hear.active = true; this.Btn_New.active = true; @@ -182,7 +183,7 @@ export default class GuideManager extends cc.Component { } //新植物按钮 - click_Choice(customData,data){ + click_Btn(customData,data){ //关掉计时器 处理逻辑之前,先行关掉按钮开关 if(data == "Btn_New"){ this.choice = 1; @@ -200,6 +201,7 @@ export default class GuideManager extends cc.Component { var label = this.Tip.getChildByName("content").getComponent(cc.Label); //正确 if(this.choice == this.customData[this.custom-2].right){ + cc.fx.AudioManager._instance.playEffect("yes",null); this.Tip.stopAllActions(); this.Tip.active = false; this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false; @@ -228,26 +230,31 @@ export default class GuideManager extends cc.Component { this.Btn_New.active = false; this.Btn_See.active = false; } - else this.createCustom(); + else this.nextLevel(); }, 1000); } else{ - var tipTemp = cc.fx.tipType.tipErrOld; + cc.fx.AudioManager._instance.playEffect("yes",null); + var tipTemp = '葡萄刚才出现过呢' this.Tip.active = true; target.getChildByName("err").active = true; target.getChildByName("correct").active = false; switch((this.custom-2)){ - case 0: case 1: - tipTemp = cc.fx.tipType.tipErrNew; + case 0: + tipTemp = "这是这局游戏第一次出现葡萄"; + break; + case 1: + tipTemp = "这是这局游戏第一次出现桃子"; break; case 2: - if(this.choice == 2) tipTemp = cc.fx.tipType.tipErrHear; + if(this.choice == 2) tipTemp = '上次遇到葡萄时,似乎不是听到的吧'; break; case 3: - if(this.choice == 3) tipTemp = cc.fx.tipType.tipErrSee; + if(this.choice == 3) tipTemp ='上次遇到桃子时,似乎不是看到的吧'; + else tipTemp = '桃子刚才出现过呢' break; case 4: - if(this.choice == 3) tipTemp = cc.fx.tipType.tipErrLast; + if(this.choice == 3) tipTemp = '之前确实看到过葡萄,但最近一次似乎不是看到的呢'; break; } label.string = tipTemp; diff --git a/assets/Script/Load.ts b/assets/Script/Load.ts index 2c490c6..6e63b3d 100644 --- a/assets/Script/Load.ts +++ b/assets/Script/Load.ts @@ -1,3 +1,4 @@ +import { WeChat } from "./module/Share/share"; const {ccclass, property, requireComponent} = cc._decorator; @@ -15,6 +16,7 @@ export default class NewClass extends cc.Component { start () { window.initMgr(); + WeChat.setShare(location.href); cc.fx.GameConfig.init(this.localTest); this.testVersion.string = this.clientTestVersion; @@ -39,6 +41,7 @@ export default class NewClass extends cc.Component { //开始游戏,跳转至引导页面 startGame(){ + setTimeout(() => { cc.director.loadScene("GuideScene"); }, 100); diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index d05edca..d108cc2 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -1,3 +1,4 @@ +import { WeChat } from "../Share/share"; import { GameTool } from "../Tool/GameTool"; @@ -46,6 +47,7 @@ export class GameConfig { stepTimeList: number; //整局游戏用时,由于涉及场景切换,数据需要保留 successList: any[]; //整局胜负 gameTime: number; //单次游戏倒计时时间 + igniteCount: number; //玩家总计成功点火数 }; //游戏内信息 @@ -108,14 +110,15 @@ export class GameConfig { gameId: "100010", //游戏ID userId: 200139, //用户ID guide: true, //是否有引导 - url: "http://api.sparkus.cn",//访问域名 + url: "https://api.sparkus.cn",//访问域名 success: false, //用户游戏成功与否 matchId: null, //用于埋点上传的ID custom: 0, //用于测试跳关卡 level: 0, //具体游戏内进行到第几步 stepTimeList:0, //整局游戏用时,由于涉及场景切换,数据需要保留 successList:[], //整局胜负 - gameTime:5 + gameTime:5, + igniteCount: 0, //玩家总计成功点火数 }; } @@ -136,7 +139,7 @@ export class GameConfig { stepTime: 0, //玩家每一关用时毫秒数 音频关卡从播放结束开始计时 levelConfig: 0, //使用的是哪一套关卡配置 ignite: false, //玩家此轮有没有点火 - igniteCount: 0 //玩家总计成功点火数 + igniteCount: 0, //玩家总计成功点火数 } } @@ -1758,7 +1761,7 @@ export class GameConfig { }, { "id": 7019, - "item": "pugongying ", + "item": "pugongying", "type": 2, "flammable": 0 }, diff --git a/assets/Script/module/Crypto/HttpUtil.ts b/assets/Script/module/Crypto/HttpUtil.ts index 15aee46..7316097 100644 --- a/assets/Script/module/Crypto/HttpUtil.ts +++ b/assets/Script/module/Crypto/HttpUtil.ts @@ -2,14 +2,20 @@ const {ccclass, property} = cc._decorator; import CryptoJS = require('./crypto-js.min.js'); //引用AES源码js -const BASE_URL = "http://api.sparkus.cn"; +const BASE_URL = "https://api.sparkus.cn"; //只负责网络接口 次类只负责和后端交互,不负责处理数据 数据处理在GameTool @ccclass export default class HttpUtil extends cc.Component { + static async getShareInfo(shareUrl: string): Promise { + console.log("设置分享链接:",shareUrl); + const time = Math.floor((new Date().getTime()) / 1000) + const url = HttpUtil.apiSign(`/api/share/cfg?gameId=${config.gameId}&time=${time}&url=${shareUrl}`,{}) + return this.post(url,null,null); + } //排行榜 static async rankData(type,callback,data): Promise { const time = Math.floor((new Date().getTime()) / 1000) - const url = apiSign(`/api/get/rank/data?gameId=${config.gameId}&dataType=${type}&time=${time}`, data) + const url = HttpUtil.apiSign(`/api/get/rank/data?gameId=${config.gameId}&dataType=${type}&time=${time}`, data) this.post(url,data,callback); } @@ -20,7 +26,7 @@ export default class HttpUtil extends cc.Component { //暂时用不到 static async getUserRecord(data,callback): Promise { const time = Math.floor((new Date().getTime()) / 1000) - const url = apiSign(`/api/get/user/data?gameId=${config.gameId}&time=${time}`, data) + const url = HttpUtil.apiSign(`/api/get/user/data?gameId=${config.gameId}&time=${time}`, data) this.post(url,data,callback); } static async post(url, data, callback) { @@ -53,6 +59,30 @@ export default class HttpUtil extends cc.Component { return null; } } + + /** + * + * @param url {string} 接口地址 + * @param params {object} 需要加密的参数对象 + */ + static apiSign(url: string, params = {}) { + + let convertUrl = url.trim() + if (convertUrl.indexOf('?') === -1) { + convertUrl += '?' + } + + // 传入参数转换拼接字符串 + let postStr = getQueryString(params) + + const signedStr = genSignStr(convertUrl, postStr) + const encryptStr = `sign=${signedStr}` + + let encryptSignStr = fxCry.encryptByDES(encryptStr, config.secretKey) + encryptSignStr = encodeURIComponent(encryptSignStr) + + return `${urlencode(convertUrl)}&_p=${encryptSignStr}` + } } function responseHandler(response: { data: any }) { @@ -195,27 +225,5 @@ function urlencode(url: string): string { return `${baseUrl}?${params.toString()}`; } -/** - * - * @param url {string} 接口地址 - * @param params {object} 需要加密的参数对象 - */ -function apiSign(url: string, params = {}) { - let convertUrl = url.trim() - if (convertUrl.indexOf('?') === -1) { - convertUrl += '?' - } - - // 传入参数转换拼接字符串 - let postStr = getQueryString(params) - - const signedStr = genSignStr(convertUrl, postStr) - const encryptStr = `sign=${signedStr}` - - let encryptSignStr = fxCry.encryptByDES(encryptStr, config.secretKey) - encryptSignStr = encodeURIComponent(encryptSignStr) - - return `${urlencode(convertUrl)}&_p=${encryptSignStr}` -} diff --git a/assets/Script/module/GameStart/GameAppStart.ts b/assets/Script/module/GameStart/GameAppStart.ts index 5d92c64..e2226b6 100644 --- a/assets/Script/module/GameStart/GameAppStart.ts +++ b/assets/Script/module/GameStart/GameAppStart.ts @@ -5,13 +5,15 @@ import { Notifications } from "../Notification/Notification"; import { StorageMessage } from "../Storage/Storage"; import { GameTool } from "../Tool/GameTool"; + window.initMgr = function() { if(cc.fx) { return; } cc.fx = {}; - console.log("初始化"); + console.log("1初始化"); + //基础状态信息 cc.fx.StateInfo = { debugMode: true, diff --git a/assets/Script/module/Music/AudioManager.ts b/assets/Script/module/Music/AudioManager.ts index 04bfeb9..cccdecb 100644 --- a/assets/Script/module/Music/AudioManager.ts +++ b/assets/Script/module/Music/AudioManager.ts @@ -54,6 +54,10 @@ export default class AudioManager extends cc.Component { taozi_audio: cc.AudioClip = null; @property(cc.AudioClip) zhuye_audio: cc.AudioClip = null; + @property(cc.AudioClip) + err: cc.AudioClip = null; + @property(cc.AudioClip) + yes: cc.AudioClip = null; mAudioMap: {}; @@ -96,16 +100,19 @@ export default class AudioManager extends cc.Component { this.mEffectSwitch = 1; } play (audioSource, loop, callback, isBgMusic) { - if (isBgMusic && !this.mMusicSwitch) return; - if (!isBgMusic && !this.mEffectSwitch) return; + // if (isBgMusic && !this.mMusicSwitch) return; + // if (!isBgMusic && !this.mEffectSwitch) return; var volume = isBgMusic ? this.bgMusicVolume : this.effectMusicVolume; - if (cc.sys.isBrowser) { - if(audioSource == this.brickSound){ - volume = 0.1; - } + // if (cc.sys.isBrowser) { + // if(audioSource == this.brickSound){ + // volume = 0.1; + // } volume = 1; - var context = cc.audioEngine.play(audioSource, loop, volume); + cc.audioEngine.setEffectsVolume(1); + cc.audioEngine.setMusicVolume(1); + + var context = cc.audioEngine.playEffect(audioSource, loop); if (callback){ cc.audioEngine.setFinishCallback(context, function(){ callback.call(this); @@ -115,9 +122,9 @@ export default class AudioManager extends cc.Component { this.mAudioMap[audioSource] = context; return audioSource; - } else { - return audioSource; - } + // } else { + // return audioSource; + // } } save () { diff --git a/assets/Script/module/Share.meta b/assets/Script/module/Share.meta new file mode 100644 index 0000000..e87268a --- /dev/null +++ b/assets/Script/module/Share.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "bdc76845-baea-4381-911e-af437cccf839", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Script/module/Share.zip b/assets/Script/module/Share.zip new file mode 100644 index 0000000..705f190 Binary files /dev/null and b/assets/Script/module/Share.zip differ diff --git a/assets/Script/module/Share.zip.meta b/assets/Script/module/Share.zip.meta new file mode 100644 index 0000000..b160e03 --- /dev/null +++ b/assets/Script/module/Share.zip.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.3", + "uuid": "b42c4fc1-4cd1-4b12-b206-930cea3d49ca", + "importer": "asset", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Script/module/Share/share.ts b/assets/Script/module/Share/share.ts new file mode 100644 index 0000000..e8e7c36 --- /dev/null +++ b/assets/Script/module/Share/share.ts @@ -0,0 +1,95 @@ + + +var shareConfig = { + gameId: "100010", + shareLine: "zDLsruVI", + EK:"hui231%1" + }; + +// 定义微信配置数据的接口 +interface IWeChatConfig { + appId: string; + timestamp: number; + nonceStr: string; + signature: string; + jsApiList: []; +} + +// 微信操作类 +export class WeChat { + static setShare(url) { + var urlTemp = this.removeQueryParams(url); + shareConfig.shareLine = urlTemp; + WeChat.getSignature(url); + } + + static getResult(res){ + if(res){ + var data = res.data; + wx.config({ + debug: false, + appId: data.appId, + timestamp: data.timestamp, + nonceStr: data.nonceStr, + signature: data.signature, + jsApiList: ['onMenuShareTimeline','updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage'] + }); + wx.checkJsApi({ + jsApiList: ['updateAppMessageShareData'], // 需要检测的JS接口列表,所有JS接口列表见附录2, + success: function(res) { + setTimeout(() => { + WeChat.changeShare(); + }, 100); + setTimeout(() => { + WeChat.changeShare(); + }, 200); + } + }); + } + } + + static changeShare(){ + wx.ready(() => { + wx.updateAppMessageShareData({ + title: '记忆力认知测评', // 分享标题 + desc: '你的认知灵活性和选择注意有问题吗', // 分享描述 + link: shareConfig.shareLine, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 + imgUrl: 'https://static.sparkus.cn/public/shennong.jpg', // 分享图标 + success: function () { + // 设置成功 + console.log("分享好友成功回调"); + } + }); + wx.updateTimelineShareData({ + title: '记忆力认知测评', // 分享标题 + link: shareConfig.shareLine, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致 + imgUrl: 'https://static.sparkus.cn/public/shennong.jpg', // 分享图标 + success: function () { + // 设置成功 + console.log("分享朋友圈成功回调"); + } + }) + }); + } + + static getSignature(url: string): Promise { + return new Promise((resolve) => { + WeChat.getShareInfo((encodeURIComponent(url)),WeChat.getResult); + }); + } + static async getShareInfo(shareUrl: string, callback:Function): Promise { + const time = Math.floor((new Date().getTime()) / 1000) + const url = cc.fx.HttpUtil.apiSign(`/api/share/cfg?gameId=${shareConfig.gameId}&time=${time}&url=${shareUrl}`,{}) + return cc.fx.HttpUtil.get(url,callback) + } + + + static containsNanana(str) { + return /test/i.test(str); + } + + static removeQueryParams(url) { + return url.replace(/\?.*$/, ''); + } + +} diff --git a/assets/Script/module/Share/share.ts.meta b/assets/Script/module/Share/share.ts.meta new file mode 100644 index 0000000..5137d2b --- /dev/null +++ b/assets/Script/module/Share/share.ts.meta @@ -0,0 +1,10 @@ +{ + "ver": "1.1.0", + "uuid": "7290c680-dfdc-4c59-9736-a614cc2a8bcf", + "importer": "typescript", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 1b9b36c..f131083 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -9,7 +9,7 @@ var GameTool = { let name = "user_" + cc.fx.GameConfig.GM_INFO.gameId; var data = JSON.parse(localStorage.getItem(name)); if(data == "undifend" || data==null || data == ""){ - let url = "http://api.sparkus.cn/api/user/auth/login?domain=hui32579WdYPsgYq&callback="+location.href; + let url = "https://api.sparkus.cn/api/user/auth/login?domain=hui32579WdYPsgYq&callback="+location.href; window.location.href = url; } else{ @@ -33,7 +33,7 @@ var GameTool = { "data": data }; - console.log("上传数据:") + console.log("上传数据:"); cc.fx.HttpUtil.uploadUserLogData(postData,function(){}) }, //上传排行榜 type为1 @@ -64,6 +64,7 @@ var GameTool = { //获取matchId 用于上传每次点击数据里面记录id方便查询 getMatchId (){ let matchId = cc.sys.localStorage.getItem("matchId"); + let tempId = matchId; if(matchId == "undifend" || matchId==null){ matchId = this.setMatchId(); } @@ -72,15 +73,20 @@ var GameTool = { matchId = this.setMatchId(); } else{ - let char = parseInt(matchId[10]); - if(this.level == 1){ + let char = parseInt(tempId.substring(10,tempId.length)); + if(cc.fx.GameConfig.GM_INFO.level == 1){ char += 1; + matchId = tempId.slice(0, 10) + char + ""; + if(this.containsNanana(matchId)) matchId = this.setMatchId(); + cc.fx.GameConfig.GM_INFO.matchId = matchId; + cc.sys.localStorage.setItem("matchId",matchId); } - matchId = matchId.slice(0, 10) + char + ""; - cc.fx.GameConfig.GM_INFO.matchId = matchId; - cc.sys.localStorage.setItem("matchId",matchId); } } + + if(this.containsNanana(matchId) == true){ + matchId = this.setMatchId(); + } return matchId; }, //检测matchId 如果有缓存以前的nanana数据清除 diff --git a/assets/resources/Json/CLICK_DATA.json b/assets/resources/Json/CLICK_DATA.json index 7ff4a49..5c67192 100644 --- a/assets/resources/Json/CLICK_DATA.json +++ b/assets/resources/Json/CLICK_DATA.json @@ -10,7 +10,7 @@ "roundType": 0, "stepTime": 0, "levelConfig": 0, - "ignite": false, - "igniteCount": 0 + "ignite": false, + "igniteCount": 0 } } \ No newline at end of file diff --git a/assets/resources/Json/GM_INFO.json b/assets/resources/Json/GM_INFO.json index ed00ff6..e6e3a98 100644 --- a/assets/resources/Json/GM_INFO.json +++ b/assets/resources/Json/GM_INFO.json @@ -6,13 +6,14 @@ "gameId": "100010", "userId": 200139, "guide": true, - "url": "http://api.sparkus.cn", + "url": "https://api.sparkus.cn", "success": false, "matchId": null, "custom": 0, "level": 0, "stepTimeList":0, "successList":[], - "gameTime":5 + "gameTime":5, + "igniteCount":0 } } \ No newline at end of file diff --git a/assets/resources/Json/LEVEL_INFO.json b/assets/resources/Json/LEVEL_INFO.json index dd028c3..3b872c1 100644 --- a/assets/resources/Json/LEVEL_INFO.json +++ b/assets/resources/Json/LEVEL_INFO.json @@ -1398,7 +1398,7 @@ }, { "id": 6025, - "item": "jinjie", + "item": "jingjie", "type": 2, "flammable": 0 }, @@ -1612,7 +1612,7 @@ }, { "id": 7019, - "item": "pugongying ", + "item": "pugongying", "type": 2, "flammable": 0 }, diff --git a/assets/resources/Music.zip b/assets/resources/Music.zip new file mode 100644 index 0000000..2c65c02 Binary files /dev/null and b/assets/resources/Music.zip differ diff --git a/assets/resources/Music.zip.meta b/assets/resources/Music.zip.meta new file mode 100644 index 0000000..1c28ec2 --- /dev/null +++ b/assets/resources/Music.zip.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.3", + "uuid": "3ff0f8f9-2af5-4f89-a713-2ae8ffdfe9d8", + "importer": "asset", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/Music/baishao_audio.mp3 b/assets/resources/Music/baishao_audio.mp3 index 1f5d4c7..9947e8b 100644 Binary files a/assets/resources/Music/baishao_audio.mp3 and b/assets/resources/Music/baishao_audio.mp3 differ diff --git a/assets/resources/Music/baishao_audio.mp3.meta b/assets/resources/Music/baishao_audio.mp3.meta index 380261e..87bf441 100644 --- a/assets/resources/Music/baishao_audio.mp3.meta +++ b/assets/resources/Music/baishao_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "47388b59-bca9-4607-bdc1-1fc7ba079a12", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.464, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/bgMusic.mp3 b/assets/resources/Music/bgMusic.mp3 new file mode 100644 index 0000000..0c7c98a Binary files /dev/null and b/assets/resources/Music/bgMusic.mp3 differ diff --git a/assets/resources/Music/bgMusic.mp3.meta b/assets/resources/Music/bgMusic.mp3.meta new file mode 100644 index 0000000..9bfb4bf --- /dev/null +++ b/assets/resources/Music/bgMusic.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "bef46737-c323-42ea-9ea7-7dc780b882b7", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 176.352653, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/Music/cha_audio.mp3 b/assets/resources/Music/cha_audio.mp3 index 467b5bf..fb0c79c 100644 Binary files a/assets/resources/Music/cha_audio.mp3 and b/assets/resources/Music/cha_audio.mp3 differ diff --git a/assets/resources/Music/cha_audio.mp3.meta b/assets/resources/Music/cha_audio.mp3.meta index ebcafe6..89bc19d 100644 --- a/assets/resources/Music/cha_audio.mp3.meta +++ b/assets/resources/Music/cha_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "b1a7d924-b756-4abd-9de4-f913e76d7ba6", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.464, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/chixiaodou_audio.mp3 b/assets/resources/Music/chixiaodou_audio.mp3 index de38e1e..1f86f72 100644 Binary files a/assets/resources/Music/chixiaodou_audio.mp3 and b/assets/resources/Music/chixiaodou_audio.mp3 differ diff --git a/assets/resources/Music/danggui_audio.mp3 b/assets/resources/Music/danggui_audio.mp3 index 51f95d7..5acb6f4 100644 Binary files a/assets/resources/Music/danggui_audio.mp3 and b/assets/resources/Music/danggui_audio.mp3 differ diff --git a/assets/resources/Music/danggui_audio.mp3.meta b/assets/resources/Music/danggui_audio.mp3.meta index 4546b71..416e2c7 100644 --- a/assets/resources/Music/danggui_audio.mp3.meta +++ b/assets/resources/Music/danggui_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "5f08c436-44f0-4802-bc19-0443972a105b", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/danshen_audio.mp3 b/assets/resources/Music/danshen_audio.mp3 index 51f95d7..e42593d 100644 Binary files a/assets/resources/Music/danshen_audio.mp3 and b/assets/resources/Music/danshen_audio.mp3 differ diff --git a/assets/resources/Music/danshen_audio.mp3.meta b/assets/resources/Music/danshen_audio.mp3.meta index 0def327..ce8c2db 100644 --- a/assets/resources/Music/danshen_audio.mp3.meta +++ b/assets/resources/Music/danshen_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "5325e681-09c2-4cdd-87f1-7b4d76247f14", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/dazao_audio.mp3 b/assets/resources/Music/dazao_audio.mp3 index 9219651..e6b4585 100644 Binary files a/assets/resources/Music/dazao_audio.mp3 and b/assets/resources/Music/dazao_audio.mp3 differ diff --git a/assets/resources/Music/dazao_audio.mp3.meta b/assets/resources/Music/dazao_audio.mp3.meta index 099d86e..719dbb0 100644 --- a/assets/resources/Music/dazao_audio.mp3.meta +++ b/assets/resources/Music/dazao_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "e97e82df-44e2-4294-89fb-dadbf44bf622", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/err.mp3 b/assets/resources/Music/err.mp3 new file mode 100644 index 0000000..fdc7d13 Binary files /dev/null and b/assets/resources/Music/err.mp3 differ diff --git a/assets/resources/Music/err.mp3.meta b/assets/resources/Music/err.mp3.meta new file mode 100644 index 0000000..c73010a --- /dev/null +++ b/assets/resources/Music/err.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "1a1f7dc6-de93-494d-b7be-fe9203b41dc0", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 0.626939, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/Music/gancao_audio.mp3 b/assets/resources/Music/gancao_audio.mp3 index d616d23..df3a032 100644 Binary files a/assets/resources/Music/gancao_audio.mp3 and b/assets/resources/Music/gancao_audio.mp3 differ diff --git a/assets/resources/Music/gancao_audio.mp3.meta b/assets/resources/Music/gancao_audio.mp3.meta index 0188cb1..36e1660 100644 --- a/assets/resources/Music/gancao_audio.mp3.meta +++ b/assets/resources/Music/gancao_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "c1fcf0fb-c572-4800-9848-1e78718fdabf", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.464, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/ganjiang_audio.mp3 b/assets/resources/Music/ganjiang_audio.mp3 index 20b790b..4117a9b 100644 Binary files a/assets/resources/Music/ganjiang_audio.mp3 and b/assets/resources/Music/ganjiang_audio.mp3 differ diff --git a/assets/resources/Music/ganjiang_audio.mp3.meta b/assets/resources/Music/ganjiang_audio.mp3.meta index 7141159..4f3c6bd 100644 --- a/assets/resources/Music/ganjiang_audio.mp3.meta +++ b/assets/resources/Music/ganjiang_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "b3d0fc52-3960-42d1-869f-39121e912bdb", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/gouqi_audio.mp3 b/assets/resources/Music/gouqi_audio.mp3 index 5a8c7a7..74144b2 100644 Binary files a/assets/resources/Music/gouqi_audio.mp3 and b/assets/resources/Music/gouqi_audio.mp3 differ diff --git a/assets/resources/Music/gouqi_audio.mp3.meta b/assets/resources/Music/gouqi_audio.mp3.meta index 9aa7835..e451183 100644 --- a/assets/resources/Music/gouqi_audio.mp3.meta +++ b/assets/resources/Music/gouqi_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "589a92bd-21cc-43d4-8594-2e9c92930f13", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.464, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/jingjie_audio.mp3 b/assets/resources/Music/jingjie_audio.mp3 index e7601aa..05fde33 100644 Binary files a/assets/resources/Music/jingjie_audio.mp3 and b/assets/resources/Music/jingjie_audio.mp3 differ diff --git a/assets/resources/Music/jingjie_audio.mp3.meta b/assets/resources/Music/jingjie_audio.mp3.meta index fc9c024..1681929 100644 --- a/assets/resources/Music/jingjie_audio.mp3.meta +++ b/assets/resources/Music/jingjie_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "5d063b36-f6ad-4d0a-ad0c-1eaf633a1293", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/jinju_audio.mp3 b/assets/resources/Music/jinju_audio.mp3 index a5beb37..426ca1d 100644 Binary files a/assets/resources/Music/jinju_audio.mp3 and b/assets/resources/Music/jinju_audio.mp3 differ diff --git a/assets/resources/Music/jinju_audio.mp3.meta b/assets/resources/Music/jinju_audio.mp3.meta index 81cafb5..cfcb5cf 100644 --- a/assets/resources/Music/jinju_audio.mp3.meta +++ b/assets/resources/Music/jinju_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "ffdbc929-ffdb-46b7-a93e-29447856ca36", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.512, + "duration": 1.567347, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/lizhi_audio.mp3 b/assets/resources/Music/lizhi_audio.mp3 index 04fab0e..915b09a 100644 Binary files a/assets/resources/Music/lizhi_audio.mp3 and b/assets/resources/Music/lizhi_audio.mp3 differ diff --git a/assets/resources/Music/lizhi_audio.mp3.meta b/assets/resources/Music/lizhi_audio.mp3.meta index e7ff281..baca304 100644 --- a/assets/resources/Music/lizhi_audio.mp3.meta +++ b/assets/resources/Music/lizhi_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "ac2f83fb-1f9e-4d58-b043-bdcd25634e14", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.464, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/lizi_audio.mp3 b/assets/resources/Music/lizi_audio.mp3 index df75e7d..43bc63f 100644 Binary files a/assets/resources/Music/lizi_audio.mp3 and b/assets/resources/Music/lizi_audio.mp3 differ diff --git a/assets/resources/Music/lizi_audio.mp3.meta b/assets/resources/Music/lizi_audio.mp3.meta index 0f250c0..a8983f6 100644 --- a/assets/resources/Music/lizi_audio.mp3.meta +++ b/assets/resources/Music/lizi_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "7a5029a4-6d49-4a15-a1bb-9faa9506e801", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.392, + "duration": 1.462857, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/longyan_audio.mp3 b/assets/resources/Music/longyan_audio.mp3 index db26c6d..d74f664 100644 Binary files a/assets/resources/Music/longyan_audio.mp3 and b/assets/resources/Music/longyan_audio.mp3 differ diff --git a/assets/resources/Music/longyan_audio.mp3.meta b/assets/resources/Music/longyan_audio.mp3.meta index 8dd73d0..9bc6932 100644 --- a/assets/resources/Music/longyan_audio.mp3.meta +++ b/assets/resources/Music/longyan_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "03f3670c-b2e3-44dc-a718-35d83b45a100", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.488, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/moli_audio.mp3 b/assets/resources/Music/moli_audio.mp3 index 414b15c..5010b1f 100644 Binary files a/assets/resources/Music/moli_audio.mp3 and b/assets/resources/Music/moli_audio.mp3 differ diff --git a/assets/resources/Music/moli_audio.mp3.meta b/assets/resources/Music/moli_audio.mp3.meta index 033c9a1..9941abf 100644 --- a/assets/resources/Music/moli_audio.mp3.meta +++ b/assets/resources/Music/moli_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "ebf27f93-6c3b-44cd-b228-944b77435936", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.44, + "duration": 1.515102, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/muchai_audio.mp3 b/assets/resources/Music/muchai_audio.mp3 index db16b94..c5ab97a 100644 Binary files a/assets/resources/Music/muchai_audio.mp3 and b/assets/resources/Music/muchai_audio.mp3 differ diff --git a/assets/resources/Music/muchai_audio.mp3.meta b/assets/resources/Music/muchai_audio.mp3.meta index 36043b9..05c4d47 100644 --- a/assets/resources/Music/muchai_audio.mp3.meta +++ b/assets/resources/Music/muchai_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "434c4832-eab0-46c1-a1ef-baa5316386b4", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.488, + "duration": 1.541224, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/mudan_audio.mp3 b/assets/resources/Music/mudan_audio.mp3 index 2a2a1a8..912e0eb 100644 Binary files a/assets/resources/Music/mudan_audio.mp3 and b/assets/resources/Music/mudan_audio.mp3 differ diff --git a/assets/resources/Music/mudan_audio.mp3.meta b/assets/resources/Music/mudan_audio.mp3.meta index 6f9a9a0..8f1c443 100644 --- a/assets/resources/Music/mudan_audio.mp3.meta +++ b/assets/resources/Music/mudan_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "c2b82d71-e775-43c4-9ba6-650d7ac46c31", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/mulan_audio.mp3 b/assets/resources/Music/mulan_audio.mp3 index df2e012..79bd584 100644 Binary files a/assets/resources/Music/mulan_audio.mp3 and b/assets/resources/Music/mulan_audio.mp3 differ diff --git a/assets/resources/Music/mulan_audio.mp3.meta b/assets/resources/Music/mulan_audio.mp3.meta index 773c098..f9a34a3 100644 --- a/assets/resources/Music/mulan_audio.mp3.meta +++ b/assets/resources/Music/mulan_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "5ae0ebd3-2b4a-4ea4-9454-7b8b4fcefad4", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.416, + "duration": 1.48898, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/pugongying_audio.mp3 b/assets/resources/Music/pugongying_audio.mp3 index 6fbae9d..247f811 100644 Binary files a/assets/resources/Music/pugongying_audio.mp3 and b/assets/resources/Music/pugongying_audio.mp3 differ diff --git a/assets/resources/Music/pugongying_audio.mp3.meta b/assets/resources/Music/pugongying_audio.mp3.meta index 697092f..222ac8d 100644 --- a/assets/resources/Music/pugongying_audio.mp3.meta +++ b/assets/resources/Music/pugongying_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "b313152c-a590-406a-90f6-e78ca8cf99fa", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.584, + "duration": 1.645714, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/putao_audio.mp3 b/assets/resources/Music/putao_audio.mp3 index 8ff2f86..c7e52c0 100644 Binary files a/assets/resources/Music/putao_audio.mp3 and b/assets/resources/Music/putao_audio.mp3 differ diff --git a/assets/resources/Music/putao_audio.mp3.meta b/assets/resources/Music/putao_audio.mp3.meta index 9f4f834..86b14df 100644 --- a/assets/resources/Music/putao_audio.mp3.meta +++ b/assets/resources/Music/putao_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "b31b447b-2c35-46ea-bb6c-84952055fae8", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.44, + "duration": 1.515102, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/renshen_audio.mp3 b/assets/resources/Music/renshen_audio.mp3 index cc41be6..de9a2c3 100644 Binary files a/assets/resources/Music/renshen_audio.mp3 and b/assets/resources/Music/renshen_audio.mp3 differ diff --git a/assets/resources/Music/renshen_audio.mp3.meta b/assets/resources/Music/renshen_audio.mp3.meta index a2a0e3b..44c12c3 100644 --- a/assets/resources/Music/renshen_audio.mp3.meta +++ b/assets/resources/Music/renshen_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "280fe06b-d0a1-4f1d-bf58-4c37e907b7ea", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.44, + "duration": 1.515102, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/taozi_audio.mp3 b/assets/resources/Music/taozi_audio.mp3 index 61e56d6..4f165e0 100644 Binary files a/assets/resources/Music/taozi_audio.mp3 and b/assets/resources/Music/taozi_audio.mp3 differ diff --git a/assets/resources/Music/taozi_audio.mp3.meta b/assets/resources/Music/taozi_audio.mp3.meta index 0fb7495..2b016d0 100644 --- a/assets/resources/Music/taozi_audio.mp3.meta +++ b/assets/resources/Music/taozi_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "4fb5e673-7017-4a1a-bf48-92250446042d", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.512, + "duration": 1.567347, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Music/yes.mp3 b/assets/resources/Music/yes.mp3 new file mode 100644 index 0000000..4ded430 Binary files /dev/null and b/assets/resources/Music/yes.mp3 differ diff --git a/assets/resources/Music/yes.mp3.meta b/assets/resources/Music/yes.mp3.meta new file mode 100644 index 0000000..e41c8f5 --- /dev/null +++ b/assets/resources/Music/yes.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "92f37348-24a6-465c-b74a-0afda604dc3d", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 0.624, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/Music/zhuye_audio.mp3 b/assets/resources/Music/zhuye_audio.mp3 index fd2c34d..fcd94bc 100644 Binary files a/assets/resources/Music/zhuye_audio.mp3 and b/assets/resources/Music/zhuye_audio.mp3 differ diff --git a/assets/resources/Music/zhuye_audio.mp3.meta b/assets/resources/Music/zhuye_audio.mp3.meta index b3aa836..e0eda33 100644 --- a/assets/resources/Music/zhuye_audio.mp3.meta +++ b/assets/resources/Music/zhuye_audio.mp3.meta @@ -3,6 +3,6 @@ "uuid": "9c9e6c09-6653-44b7-8a72-9eddc54c2425", "importer": "audio-clip", "downloadMode": 0, - "duration": 1.44, + "duration": 1.515102, "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/Ui/Food.plist b/assets/resources/Ui/Food.plist index 1d11c45..2cae4fb 100644 --- a/assets/resources/Ui/Food.plist +++ b/assets/resources/Ui/Food.plist @@ -9,13 +9,13 @@ aliases spriteOffset - {-4,1} + {-5,9} spriteSize - {434,434} + {428,378} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{425,813},{428,378}} textureRotated @@ -24,13 +24,13 @@ aliases spriteOffset - {-4,1} + {-6,0} spriteSize - {434,434} + {428,338} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1223,863},{428,338}} textureRotated @@ -39,13 +39,13 @@ aliases spriteOffset - {-4,1} + {-2,3} spriteSize - {434,434} + {420,370} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{417,1193},{420,370}} textureRotated @@ -54,13 +54,13 @@ aliases spriteOffset - {-4,1} + {-4,16} spriteSize - {434,434} + {414,390} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,825},{414,390}} textureRotated @@ -69,13 +69,13 @@ aliases spriteOffset - {-4,1} + {-7,15} spriteSize - {434,434} + {422,386} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,437},{422,386}} textureRotated @@ -84,15 +84,15 @@ aliases spriteOffset - {-4,1} + {-1,6} spriteSize - {434,434} + {426,342} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1315,1},{426,342}} textureRotated - + prop_gancao.png @@ -105,7 +105,7 @@ spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1},{434,434}} textureRotated @@ -114,13 +114,13 @@ aliases spriteOffset - {-4,1} + {-11,4} spriteSize - {434,434} + {382,300} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{385,1565},{382,300}} textureRotated @@ -129,15 +129,15 @@ aliases spriteOffset - {-4,1} + {0,-12} spriteSize - {434,434} + {442,390} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{875,403},{442,390}} textureRotated - + prop_jingjie.png @@ -150,7 +150,7 @@ spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1},{434,434}} textureRotated @@ -159,13 +159,13 @@ aliases spriteOffset - {-4,1} + {-4,21} spriteSize - {434,434} + {432,380} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{437,431},{432,380}} textureRotated @@ -174,13 +174,13 @@ aliases spriteOffset - {-11,11} + {-13,-5} spriteSize - {358,390} + {322,350} spriteSourceSize {442,442} textureRect - {{1,937},{358,390}} + {{769,1565},{322,350}} textureRotated @@ -195,7 +195,7 @@ spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1},{434,434}} textureRotated @@ -204,13 +204,13 @@ aliases spriteOffset - {-4,1} + {-13,13} spriteSize - {434,434} + {416,338} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1249,1545},{416,338}} textureRotated @@ -219,28 +219,28 @@ aliases spriteOffset - {-1,1} + {-7,3} spriteSize - {438,438} + {428,436} spriteSourceSize {442,442} textureRect - {{1,497},{438,438}} + {{437,1},{428,436}} textureRotated - + prop_muchai.png aliases spriteOffset - {0,0} + {-6,4} spriteSize - {560,494} + {408,268} spriteSourceSize - {560,494} + {442,442} textureRect - {{1,1},{560,494}} + {{839,1291},{408,268}} textureRotated @@ -255,7 +255,7 @@ spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1},{434,434}} textureRotated @@ -270,7 +270,7 @@ spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1},{434,434}} textureRotated @@ -279,13 +279,13 @@ aliases spriteOffset - {-4,1} + {-2,6} spriteSize - {434,434} + {438,400} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{875,1},{438,400}} textureRotated @@ -294,13 +294,13 @@ aliases spriteOffset - {-1,1} + {12,-5} spriteSize - {434,386} + {418,340} spriteSourceSize {442,442} textureRect - {{441,933},{434,386}} + {{1249,1203},{418,340}} textureRotated @@ -309,28 +309,28 @@ aliases spriteOffset - {-4,1} + {0,14} spriteSize - {434,434} + {442,366} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{855,847},{442,366}} textureRotated - + prop_taozi.png aliases spriteOffset - {-4,1} + {-16,-15} spriteSize - {434,434} + {382,382} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1,1217},{382,382}} textureRotated @@ -339,15 +339,15 @@ aliases spriteOffset - {-4,1} + {-4,4} spriteSize - {434,434} + {432,388} spriteSourceSize {442,442} textureRect - {{441,497},{434,434}} + {{1267,429},{432,388}} textureRotated - + metadata @@ -361,9 +361,9 @@ realTextureFileName Food.png size - {876,1320} + {1668,1888} smartupdate - $TexturePacker:SmartUpdate:e5a221df16fe6f4f817b09ac8ea090a7:98a635a56ae7e114dbeab8055bac1a15:163e62934c25e06ca257725760fde093$ + $TexturePacker:SmartUpdate:19c72317a840cdcde7cad014799b6eb6:6cd875bb7d66a2681825358019f17b10:163e62934c25e06ca257725760fde093$ textureFileName Food.png diff --git a/assets/resources/Ui/Food.plist.meta b/assets/resources/Ui/Food.plist.meta index 2595ef6..4ec09e0 100644 --- a/assets/resources/Ui/Food.plist.meta +++ b/assets/resources/Ui/Food.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "size": { - "width": 876, - "height": 1320 + "width": 1668, + "height": 1888 }, "type": "Texture Packer", "subMetas": { @@ -17,12 +17,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -5, + "offsetY": 9, + "trimX": 425, + "trimY": 813, + "width": 428, + "height": 378, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -40,12 +40,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -6, + "offsetY": 0, + "trimX": 1223, + "trimY": 863, + "width": 428, + "height": 338, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -63,12 +63,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -2, + "offsetY": 3, + "trimX": 417, + "trimY": 1193, + "width": 420, + "height": 370, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -87,11 +87,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetY": 16, + "trimX": 1, + "trimY": 825, + "width": 414, + "height": 390, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -109,12 +109,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -7, + "offsetY": 15, + "trimX": 1, + "trimY": 437, + "width": 422, + "height": 386, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -131,13 +131,13 @@ "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "rotated": true, + "offsetX": -1, + "offsetY": 6, + "trimX": 1315, + "trimY": 1, + "width": 426, + "height": 342, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -157,8 +157,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 441, - "trimY": 497, + "trimX": 1, + "trimY": 1, "width": 434, "height": 434, "rawWidth": 442, @@ -178,12 +178,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -11, + "offsetY": 4, + "trimX": 385, + "trimY": 1565, + "width": 382, + "height": 300, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -200,13 +200,13 @@ "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "rotated": true, + "offsetX": 0, + "offsetY": -12, + "trimX": 875, + "trimY": 403, + "width": 442, + "height": 390, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -226,8 +226,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 441, - "trimY": 497, + "trimX": 1, + "trimY": 1, "width": 434, "height": 434, "rawWidth": 442, @@ -248,11 +248,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetY": 21, + "trimX": 437, + "trimY": 431, + "width": 432, + "height": 380, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -270,12 +270,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": true, - "offsetX": -11, - "offsetY": 11, - "trimX": 1, - "trimY": 937, - "width": 358, - "height": 390, + "offsetX": -13, + "offsetY": -5, + "trimX": 769, + "trimY": 1565, + "width": 322, + "height": 350, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -295,8 +295,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 441, - "trimY": 497, + "trimX": 1, + "trimY": 1, "width": 434, "height": 434, "rawWidth": 442, @@ -316,12 +316,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -13, + "offsetY": 13, + "trimX": 1249, + "trimY": 1545, + "width": 416, + "height": 338, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -338,13 +338,13 @@ "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 1, - "trimY": 497, - "width": 438, - "height": 438, + "rotated": true, + "offsetX": -7, + "offsetY": 3, + "trimX": 437, + "trimY": 1, + "width": 428, + "height": 436, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -362,14 +362,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 560, - "height": 494, - "rawWidth": 560, - "rawHeight": 494, + "offsetX": -6, + "offsetY": 4, + "trimX": 839, + "trimY": 1291, + "width": 408, + "height": 268, + "rawWidth": 442, + "rawHeight": 442, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -387,8 +387,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 441, - "trimY": 497, + "trimX": 1, + "trimY": 1, "width": 434, "height": 434, "rawWidth": 442, @@ -410,8 +410,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 441, - "trimY": 497, + "trimX": 1, + "trimY": 1, "width": 434, "height": 434, "rawWidth": 442, @@ -431,12 +431,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -2, + "offsetY": 6, + "trimX": 875, + "trimY": 1, + "width": 438, + "height": 400, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -454,12 +454,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 441, - "trimY": 933, - "width": 434, - "height": 386, + "offsetX": 12, + "offsetY": -5, + "trimX": 1249, + "trimY": 1203, + "width": 418, + "height": 340, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -476,13 +476,13 @@ "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "rotated": true, + "offsetX": 0, + "offsetY": 14, + "trimX": 855, + "trimY": 847, + "width": 442, + "height": 366, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -500,12 +500,12 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetX": -16, + "offsetY": -15, + "trimX": 1, + "trimY": 1217, + "width": 382, + "height": 382, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, @@ -522,13 +522,13 @@ "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -4, - "offsetY": 1, - "trimX": 441, - "trimY": 497, - "width": 434, - "height": 434, + "offsetY": 4, + "trimX": 1267, + "trimY": 429, + "width": 432, + "height": 388, "rawWidth": 442, "rawHeight": 442, "borderTop": 0, diff --git a/assets/resources/Ui/Food.png b/assets/resources/Ui/Food.png index 6557457..5708dea 100644 Binary files a/assets/resources/Ui/Food.png and b/assets/resources/Ui/Food.png differ diff --git a/assets/resources/Ui/Food.png.meta b/assets/resources/Ui/Food.png.meta index 4cf25f8..63575b7 100644 --- a/assets/resources/Ui/Food.png.meta +++ b/assets/resources/Ui/Food.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 876, - "height": 1320, + "width": 1668, + "height": 1888, "platformSettings": {}, "subMetas": {} } \ No newline at end of file diff --git a/build-templates/web-mobile/index.html b/build-templates/web-mobile/index.html index ff22b48..6074379 100644 --- a/build-templates/web-mobile/index.html +++ b/build-templates/web-mobile/index.html @@ -46,7 +46,7 @@