Skip to content

B
babycare_xiaoxiao
Commit 2b1692e2 authored by 邱旭's avatar 邱旭
Browse files
Options

Rule

parent cfaf01cd
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 92 deletions
.idea/workspace.xml
View file @ 2b1692e2
......@@ -2,19 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/resource/RulePanel/ruleBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/guide_fox.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_fox.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/guide_hand.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_hand.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/guide_light.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_light.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/guide_tip.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_tip.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/remindIcon.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/关闭按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/关闭按钮.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/RulePanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -117,7 +112,7 @@
<option name="presentableId" value="Default" />
<updated>1612576978320</updated>
<workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="13978000" />
<workItem from="1612577003915" duration="14842000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
......@@ -133,7 +128,14 @@
<option name="project" value="LOCAL" />
<updated>1612593007212</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="首页引导">
<created>1612597435229</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1612597435229</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -145,6 +147,7 @@
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="斐乐消消乐" />
<MESSAGE value="gameGuide" />
<option name="LAST_COMMIT_MESSAGE" value="gameGuide" />
<MESSAGE value="首页引导" />
<option name="LAST_COMMIT_MESSAGE" value="首页引导" />
</component>
</project>
\ No newline at end of file
resource/common/关闭按钮.png
View replaced file @ cfaf01cd View file @ 2b1692e2
resource/common/关闭按钮.png

10.2 KB | W: | H:

resource/common/关闭按钮.png

8.45 KB | W: | H:

resource/common/关闭按钮.png
resource/common/关闭按钮.png
resource/common/关闭按钮.png
resource/common/关闭按钮.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 2b1692e2
......@@ -41,7 +41,7 @@
"name": "PrizePanel"
},
{
"keys": "活动规则背景.png",
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
......
src/ResJson.ts
View file @ 2b1692e2
......@@ -41,7 +41,7 @@ export const ResJson = {
"name": "PrizePanel"
},
{
"keys": "活动规则背景.png",
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
......
src/SkinJson.ts
View file @ 2b1692e2
......@@ -35,7 +35,6 @@ export const SkinJson = {
"name": "闯关成功Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "闯关成功Bg.png"
......@@ -45,7 +44,6 @@ export const SkinJson = {
"name": "继续闯关大",
"x": 163,
"y": 935,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关大.png"
......@@ -56,7 +54,6 @@ export const SkinJson = {
"name": "继续闯关小",
"x": 381,
"y": 935,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关小.png"
......@@ -67,7 +64,6 @@ export const SkinJson = {
"name": "闯关成功不满星按钮",
"x": 91,
"y": 935,
"alpha": 1,
"type": "button",
"props": {
"tUp": "闯关成功不满星按钮.png"
......@@ -78,7 +74,6 @@ export const SkinJson = {
"name": "关卡文字",
"x": 300,
"y": 501,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
......@@ -93,7 +88,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 210,
"y": 815,
"alpha": 1,
"type": "text",
"props": {
"text": "太厉害了！\n再闯6关就即可抽奖！",
......@@ -107,7 +101,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -148,7 +141,6 @@ export const SkinJson = {
"name": "闯关成功",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "闯关成功.png"
......@@ -158,7 +150,6 @@ export const SkinJson = {
"name": "继续闯关大",
"x": 163,
"y": 1086,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关大.png"
......@@ -169,7 +160,6 @@ export const SkinJson = {
"name": "继续闯关小",
"x": 93,
"y": 1086,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关小.png"
......@@ -180,7 +170,6 @@ export const SkinJson = {
"name": "去抽奖",
"x": 383,
"y": 1086,
"alpha": 1,
"type": "button",
"props": {
"tUp": "去抽奖.png"
......@@ -191,7 +180,6 @@ export const SkinJson = {
"name": "关卡文字",
"x": 300,
"y": 501,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
......@@ -206,7 +194,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 182,
"y": 810,
"alpha": 1,
"type": "text",
"props": {
"text": "太厉害了！获得抽奖资格！",
......@@ -220,7 +207,6 @@ export const SkinJson = {
"name": "红包奖励",
"x": 130,
"y": 870,
"alpha": 1,
"type": "sprite",
"props": {
"source": ""
......@@ -283,7 +269,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -302,7 +287,6 @@ export const SkinJson = {
"name": "步数耗尽Bg",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "步数耗尽Bg.png"
......@@ -312,7 +296,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 163,
"y": 661,
"alpha": 1,
"type": "text",
"props": {
"text": "消耗20积分可复活 ，步数+5\n确认复活吗？",
......@@ -326,7 +309,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -337,7 +319,6 @@ export const SkinJson = {
"name": "步数耗尽复活",
"x": 383,
"y": 845,
"alpha": 1,
"type": "button",
"props": {
"tUp": "步数耗尽复活.png"
......@@ -348,7 +329,6 @@ export const SkinJson = {
"name": "步数耗尽结束按钮",
"x": 93,
"y": 845,
"alpha": 1,
"type": "button",
"props": {
"tUp": "步数耗尽结束按钮.png"
......@@ -367,7 +347,6 @@ export const SkinJson = {
"name": "失败Bg",
"x": 55,
"y": 276,
"alpha": 1,
"type": "sprite",
"props": {
"source": "失败Bg.png"
......@@ -377,7 +356,6 @@ export const SkinJson = {
"name": "关卡文字",
"x": 300,
"y": 521,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
......@@ -392,7 +370,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 224,
"y": 611,
"alpha": 1,
"type": "text",
"props": {
"text": "再接再厉！\n再闯3关可参与抽奖！",
......@@ -406,7 +383,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -417,7 +393,6 @@ export const SkinJson = {
"name": "失败重新闯关",
"x": 163,
"y": 957,
"alpha": 1,
"type": "button",
"props": {
"tUp": "失败重新闯关.png"
......@@ -436,7 +411,6 @@ export const SkinJson = {
"name": "开始闯关Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "开始闯关Bg.png"
......@@ -446,7 +420,6 @@ export const SkinJson = {
"name": "开始闯关要能量",
"x": 163,
"y": 899,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关要能量.png"
......@@ -457,7 +430,6 @@ export const SkinJson = {
"name": "开始闯关不要能量",
"x": 163,
"y": 899,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关不要能量.png"
......@@ -468,7 +440,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 221,
"y": 847,
"alpha": 1,
"type": "text",
"props": {
"text": "本关满星可获得随机道具",
......@@ -482,7 +453,6 @@ export const SkinJson = {
"name": "关卡文字",
"x": 317,
"y": 521,
"alpha": 1,
"type": "text",
"props": {
"text": "第 6 关",
......@@ -497,7 +467,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -516,7 +485,6 @@ export const SkinJson = {
"name": "关卡弹窗Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "关卡弹窗Bg.png"
......@@ -526,7 +494,6 @@ export const SkinJson = {
"name": "关卡数",
"x": 312,
"y": 521,
"alpha": 1,
"type": "text",
"props": {
"text": "第 6 关",
......@@ -541,7 +508,6 @@ export const SkinJson = {
"name": "提示文案",
"x": 206,
"y": 849,
"alpha": 1,
"type": "text",
"props": {
"text": "通关参与抽奖，最高可赢得",
......@@ -555,7 +521,6 @@ export const SkinJson = {
"name": "开始闯关要能量",
"x": 163,
"y": 1120,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关要能量.png"
......@@ -566,7 +531,6 @@ export const SkinJson = {
"name": "开始闯关不要能量",
"x": 163,
"y": 1120,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关不要能量.png"
......@@ -577,7 +541,6 @@ export const SkinJson = {
"name": "prize",
"x": 130,
"y": 903,
"alpha": 1,
"type": "sprite",
"props": {
"source": "prize.png"
......@@ -588,7 +551,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -607,7 +569,6 @@ export const SkinJson = {
"name": "体力不足Bg",
"x": 55,
"y": 497,
"alpha": 1,
"type": "sprite",
"props": {
"source": "体力不足Bg.png"
......@@ -617,7 +578,6 @@ export const SkinJson = {
"name": "体力不足按钮",
"x": 163,
"y": 880,
"alpha": 1,
"type": "button",
"props": {
"tUp": "体力不足按钮.png"
......@@ -628,7 +588,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -647,7 +606,6 @@ export const SkinJson = {
"name": "增加体力背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "增加体力背景.png"
......@@ -657,7 +615,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -668,7 +625,6 @@ export const SkinJson = {
"name": "无字按钮底",
"x": 163,
"y": 805,
"alpha": 1,
"type": "button",
"props": {
"tUp": "无字按钮底.png"
......@@ -679,13 +635,11 @@ export const SkinJson = {
"name": "文案",
"x": 426,
"y": 682,
"alpha": 1,
"type": "text",
"props": {
"text": "+\t1",
"size": 36,
"fillColor": "#ffffff",
"textAlpha": 1
},
"id": "msgTxt"
}
......@@ -701,7 +655,6 @@ export const SkinJson = {
"name": "活动规则背景",
"x": 55,
"y": 438,
"alpha": 1,
"type": "sprite",
"props": {
"source": "活动规则背景.png"
......@@ -709,9 +662,8 @@ export const SkinJson = {
},
{
"name": "关闭按钮",
"x": 631,
"y": 410,
"alpha": 1,
"x": 651,
"y": 415,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -730,7 +682,6 @@ export const SkinJson = {
"name": "背景",
"x": 55,
"y": 376,
"alpha": 1,
"type": "sprite",
"props": {
"source": "prizePanel.png"
......@@ -740,7 +691,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 500,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -751,7 +701,6 @@ export const SkinJson = {
"name": "文案",
"x": 203,
"y": 650,
"alpha": 1,
"type": "text",
"props": {
"text": "恭喜获得XX奖品",
......@@ -765,7 +714,6 @@ export const SkinJson = {
"name": "prizeImg",
"x": 250,
"y": 732,
"alpha": 1,
"type": "sprite",
"props": {
"source": ""
......@@ -776,7 +724,6 @@ export const SkinJson = {
"name": "立即领取",
"x": 163,
"y": 1002,
"alpha": 1,
"type": "button",
"props": {
"tUp": "prizePanelBtn.png"
......@@ -795,7 +742,6 @@ export const SkinJson = {
"name": "任务背景",
"x": 0,
"y": 579,
"alpha": 1,
"type": "sprite",
"props": {
"source": "任务背景.png"
......@@ -849,7 +795,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 671,
"y": 708,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -868,7 +813,6 @@ export const SkinJson = {
"name": "道具不足背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "道具不足背景.png"
......@@ -878,7 +822,6 @@ export const SkinJson = {
"name": "文案",
"x": 203,
"y": 650,
"alpha": 1,
"type": "text",
"props": {
"text": "要消耗200积分兑换码？",
......@@ -892,7 +835,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -903,7 +845,6 @@ export const SkinJson = {
"name": "确定",
"x": 383,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "确定.png"
......@@ -914,7 +855,6 @@ export const SkinJson = {
"name": "再想想",
"x": 93,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "再想想.png"
......@@ -933,7 +873,6 @@ export const SkinJson = {
"name": "兑换成功背景",
"x": 55,
"y": 337,
"alpha": 1,
"type": "sprite",
"props": {
"source": "兑换成功背景.png"
......@@ -943,7 +882,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -954,7 +892,6 @@ export const SkinJson = {
"name": "知道啦",
"x": 163,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "知道啦.png"
......@@ -973,7 +910,6 @@ export const SkinJson = {
"name": "积分不足背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "积分不足背景.png"
......@@ -983,7 +919,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -994,7 +929,6 @@ export const SkinJson = {
"name": "赚取积分",
"x": 163,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "赚取积分.png"
......@@ -1013,7 +947,6 @@ export const SkinJson = {
"name": "圆圈",
"x": 55,
"y": 267,
"alpha": 1,
"type": "sprite",
"props": {
"source": "圆圈.png"
......@@ -1023,7 +956,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -1034,7 +966,6 @@ export const SkinJson = {
"name": "开心收下",
"x": 163,
"y": 900,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开心收下.png"
......@@ -1053,7 +984,6 @@ export const SkinJson = {
"name": "使用道具背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "使用道具背景.png"
......@@ -1063,7 +993,6 @@ export const SkinJson = {
"name": "文案",
"x": 168,
"y": 619,
"alpha": 1,
"type": "text",
"props": {
"text": "确认使用步数道具+10步吗？",
......@@ -1077,7 +1006,6 @@ export const SkinJson = {
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
......@@ -1088,7 +1016,6 @@ export const SkinJson = {
"name": "确定",
"x": 383,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "确定.png"
......@@ -1099,7 +1026,6 @@ export const SkinJson = {
"name": "再想想",
"x": 93,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "再想想.png"
......
src/panels/RulePanel.ts
View file @ 2b1692e2
import { Panel } from "../../module/views/Panel";
import { Tools } from "../Tools";
import { RES } from "../../module/RES";
import TextField = FYGE.TextField;
import TEXT_lINETYPE = FYGE.TEXT_lINETYPE;
import ScrollPage = FYGE.ScrollPage;
import { Tools } from "../Tools";
import Button = FYGE.Button;
import MouseEvent = FYGE.MouseEvent;
export class RulePanel extends Panel {
get groupNames() {
......@@ -37,6 +40,10 @@ export class RulePanel extends Panel {
this.scroll.position.set(96, 549);
this.scroll.view.addChild(this.ruleTex);
this.addChild(new Button(RES.getRes('ruleBtn.png')))
.addEventListener(MouseEvent.CLICK, () => this.hidePanel())
.position.set(192, 1095);
}
initEvents() {
......
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