Skip to content

D
db-game-template
Commit c814cdc9 authored by 邱旭's avatar 邱旭
Browse files
Options

引导增加跳过按钮

parent c2540c8d
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 69 deletions
.idea/workspace.xml
View file @ c814cdc9
...@@ -52,16 +52,18 @@ ...@@ -52,16 +52,18 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/default.res.json" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/default.res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/GuideSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/GuideSkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/MainSceneSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/MainSceneSkin.exml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/skins/MainSceneSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/MainSceneSkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/MainUISkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/MainUISkin.exml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/resource/skins/MainUISkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/MainUISkin.exml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/GameGroupPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/GameGroupPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Panels/GameGroupPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/GameGroupPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/MedalsPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/MedalsPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Panels/Guide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/Guide.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/MainScene/MainUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/MainScene/MainUI.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Scenes/MainScene/MainUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/MainScene/MainUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/Medal.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/Medal.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/Medal.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/Medal.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/RoomScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/RoomScene/RoomScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Tools.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/mock/config.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/mock/config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/joyousManor/consumerInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/joyousManor/consumerInfo.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -276,7 +278,7 @@ ...@@ -276,7 +278,7 @@
<workItem from="1608515522710" duration="10713000" /> <workItem from="1608515522710" duration="10713000" />
<workItem from="1608601953024" duration="20623000" /> <workItem from="1608601953024" duration="20623000" />
<workItem from="1608688205451" duration="28013000" /> <workItem from="1608688205451" duration="28013000" />
<workItem from="1608774633665" duration="15028000" /> <workItem from="1608774633665" duration="15999000" />
</task> </task>
<task id="LOCAL-00001" summary="fk"> <task id="LOCAL-00001" summary="fk">
<created>1599451512431</created> <created>1599451512431</created>
...@@ -523,7 +525,14 @@ ...@@ -523,7 +525,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1608791948798</updated> <updated>1608791948798</updated>
</task> </task>
<option name="localTasksCounter" value="36" /> <task id="LOCAL-00036" summary="勋章系统">
<created>1608794849558</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1608794849558</updated>
</task>
<option name="localTasksCounter" value="37" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -569,14 +578,14 @@ ...@@ -569,14 +578,14 @@
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="181" y="287" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603801680351" /> <state x="181" y="287" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603801680351" />
<state x="515" y="185" key="CommitChangelistDialog2" timestamp="1608791948115"> <state x="515" y="185" key="CommitChangelistDialog2" timestamp="1608794849311">
<screen x="42" y="25" width="1878" height="1175" /> <screen x="42" y="25" width="1878" height="1175" />
</state> </state>
<state x="506" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1603717521076" /> <state x="506" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1603717521076" />
<state x="447" y="163" key="CommitChangelistDialog2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968458720" /> <state x="447" y="163" key="CommitChangelistDialog2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968458720" />
<state x="507" y="183" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688762315" /> <state x="507" y="183" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688762315" />
<state x="513" y="185" key="CommitChangelistDialog2/39.25.1881.1175@39.25.1881.1175" timestamp="1606803937022" /> <state x="513" y="185" key="CommitChangelistDialog2/39.25.1881.1175@39.25.1881.1175" timestamp="1606803937022" />
<state x="515" y="185" key="CommitChangelistDialog2/42.25.1878.1175@42.25.1878.1175" timestamp="1608791948115" /> <state x="515" y="185" key="CommitChangelistDialog2/42.25.1878.1175@42.25.1878.1175" timestamp="1608794849311" />
<state width="1211" height="223" key="GridCell.Tab.0.bottom" timestamp="1608793207422"> <state width="1211" height="223" key="GridCell.Tab.0.bottom" timestamp="1608793207422">
<screen x="42" y="25" width="1878" height="1175" /> <screen x="42" y="25" width="1878" height="1175" />
</state> </state>
...@@ -698,13 +707,13 @@ ...@@ -698,13 +707,13 @@
<state x="246" y="270" key="SettingsEditor.inPresentationMode/30.23.1890.1177@30.23.1890.1177" timestamp="1603801810750" /> <state x="246" y="270" key="SettingsEditor.inPresentationMode/30.23.1890.1177@30.23.1890.1177" timestamp="1603801810750" />
<state x="319" y="424" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1603802072691" /> <state x="319" y="424" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1603802072691" />
<state x="329" y="425" key="SettingsEditor/42.25.1878.1175@42.25.1878.1175" timestamp="1608716521124" /> <state x="329" y="425" key="SettingsEditor/42.25.1878.1175@42.25.1878.1175" timestamp="1608716521124" />
<state x="583" y="340" key="Vcs.Push.Dialog.v2" timestamp="1608791962968"> <state x="583" y="340" key="Vcs.Push.Dialog.v2" timestamp="1608794850880">
<screen x="42" y="25" width="1878" height="1175" /> <screen x="42" y="25" width="1878" height="1175" />
</state> </state>
<state x="575" y="338" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1603939922392" /> <state x="575" y="338" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1603939922392" />
<state x="507" y="298" key="Vcs.Push.Dialog.v2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968451224" /> <state x="507" y="298" key="Vcs.Push.Dialog.v2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968451224" />
<state x="576" y="338" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688763746" /> <state x="576" y="338" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688763746" />
<state x="583" y="340" key="Vcs.Push.Dialog.v2/42.25.1878.1175@42.25.1878.1175" timestamp="1608791962968" /> <state x="583" y="340" key="Vcs.Push.Dialog.v2/42.25.1878.1175@42.25.1878.1175" timestamp="1608794850880" />
<state x="341" y="297" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1608789122669"> <state x="341" y="297" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1608789122669">
<screen x="42" y="25" width="1878" height="1175" /> <screen x="42" y="25" width="1878" height="1175" />
</state> </state>
...@@ -731,7 +740,7 @@ ...@@ -731,7 +740,7 @@
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="960" y="593" width="778" height="503" key="org.intellij.images.editor.actions.BackgroundImageDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603777183383" /> <state x="960" y="593" width="778" height="503" key="org.intellij.images.editor.actions.BackgroundImageDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603777183383" />
<state x="648" y="289" width="895" height="676" key="search.everywhere.popup" timestamp="1608794450277"> <state x="648" y="289" width="895" height="676" key="search.everywhere.popup" timestamp="1608795785821">
<screen x="42" y="25" width="1878" height="1175" /> <screen x="42" y="25" width="1878" height="1175" />
</state> </state>
<state x="485" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1603247992539" /> <state x="485" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1603247992539" />
...@@ -739,6 +748,6 @@ ...@@ -739,6 +748,6 @@
<state x="486" y="220" width="670" height="504" key="search.everywhere.popup/32.23.1408.877@32.23.1408.877" timestamp="1604066536579" /> <state x="486" y="220" width="670" height="504" key="search.everywhere.popup/32.23.1408.877@32.23.1408.877" timestamp="1604066536579" />
<state x="646" y="289" width="896" height="676" key="search.everywhere.popup/39.25.1881.1175@39.25.1881.1175" timestamp="1606988621747" /> <state x="646" y="289" width="896" height="676" key="search.everywhere.popup/39.25.1881.1175@39.25.1881.1175" timestamp="1606988621747" />
<state x="571" y="255" width="781" height="590" key="search.everywhere.popup/42.25.1638.1025@42.25.1638.1025" timestamp="1608605806280" /> <state x="571" y="255" width="781" height="590" key="search.everywhere.popup/42.25.1638.1025@42.25.1638.1025" timestamp="1608605806280" />
<state x="648" y="289" width="895" height="676" key="search.everywhere.popup/42.25.1878.1175@42.25.1878.1175" timestamp="1608794450277" /> <state x="648" y="289" width="895" height="676" key="search.everywhere.popup/42.25.1878.1175@42.25.1878.1175" timestamp="1608795785821" />
</component> </component>
</project> </project>
\ No newline at end of file
egret/libs/tw/enum/NetName.ts
View file @ c814cdc9
...@@ -151,5 +151,7 @@ export enum NetName { ...@@ -151,5 +151,7 @@ export enum NetName {
UNLOCK_LAND, UNLOCK_LAND,
QUESTION_LIST, QUESTION_LIST,
ACHIEVES, ACHIEVES,
GAMEGROUP_MARK,
GAMEGROUP_PRIZE,
} }
egret/libs/tw/manager/NetManager.ts
View file @ c814cdc9
...@@ -1572,6 +1572,41 @@ export class NetManager extends ABNetManager { ...@@ -1572,6 +1572,41 @@ export class NetManager extends ABNetManager {
}; };
this.send(net); this.send(net);
} }
/**
* 用户去玩游戏合集里的游戏，发接口告诉后端打一个标记，用于后端发奖
* @param callback
*/
public gameGroupMark(callback: Function) {
const net: INetData = {
name: NetName.GAMEGROUP_MARK,
uri: '/projectx/{projectId}/game/mark.do',
type: 'post',
dataType: 'json',
param: {},
callback: callback,
hideMsg: true,
};
this.send(net);
}
/**
* 进游戏或者用户玩游戏合集里的游戏回来，发接口告诉后端，后端判断是否发奖
* @param callback
*/
public gameGroupPrize(callback: Function) {
const net: INetData = {
name: NetName.GAMEGROUP_PRIZE,
uri: '/projectx/{projectId}/game/join.do',
type: 'post',
dataType: 'json',
param: {},
callback: callback,
hideMsg: true,
};
this.send(net);
}
} }
// window['nt'] = NetManager.ins; // window['nt'] = NetManager.ins;
......
egret/resource/default.res.json
View file @ c814cdc9
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"name": "gameGroup_panel" "name": "gameGroup_panel"
}, },
{ {
"keys": "guide3_tip_png,guide3_btn_png,guide2_tip_png,guide2_land_png,guide1_tip_png,guide1_btn_png,guide_point_png,guide_hand_png,guide_bg_jpg", "keys": "guide3_tip_png,guide3_btn_png,guide2_tip_png,guide2_land_png,guide1_tip_png,guide1_btn_png,guide_point_png,guide_hand_png,guide_bg_jpg,guide_cancel_png",
"name": "guide" "name": "guide"
}, },
{ {
...@@ -1206,6 +1206,11 @@ ...@@ -1206,6 +1206,11 @@
"url": "assets/medals_panel/medal_wait_dis.png", "url": "assets/medals_panel/medal_wait_dis.png",
"type": "image", "type": "image",
"name": "medal_wait_dis_png" "name": "medal_wait_dis_png"
},
{
"url": "assets/guide/guide_cancel.png",
"type": "image",
"name": "guide_cancel_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/GuideSkin.exml
View file @ c814cdc9
...@@ -3,52 +3,52 @@ ...@@ -3,52 +3,52 @@
<w:Config id="16e64c53e86"/> <w:Config id="16e64c53e86"/>
<e:Group id="group" horizontalCenter="0" verticalCenter="0" left="0" right="0" bottom="0" top="0"> <e:Group id="group" horizontalCenter="0" verticalCenter="0" left="0" right="0" bottom="0" top="0">
<e:Image id="bg" scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" source="guide_bg_jpg" visible="false"/> <e:Image id="bg" scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" source="guide_bg_jpg" visible="false"/>
<e:Group id="guideBack" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" touchChildren="false" touchEnabled="false"> <e:Group id="guideBack" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" touchChildren="false" touchEnabled="false"/>
</e:Group>
<e:Rect verticalCenter="0" top="0" horizontalCenter="0" left="0" right="0" bottom="0" fillAlpha="0.6"/> <e:Rect verticalCenter="0" top="0" horizontalCenter="0" left="0" right="0" bottom="0" fillAlpha="0.6"/>
<e:Group id="guide1" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false"> <e:Group id="guide1" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false">
<e:Image source="plant_land_active_png" x="184" y="550"/> <e:Image source="plant_land_active_png" x="184" y="550"/>
<e:Image id="guide1_tip" source="guide1_tip_png" x="262" y="795"/> <e:Image id="guide1_tip" source="guide1_tip_png" x="262" y="795"/>
<e:Button id="guide1_btn" label="" anchorOffsetX="95" anchorOffsetY="23" verticalCenter="151" horizontalCenter="112"> <e:Button id="guide1_btn" label="" anchorOffsetX="95" anchorOffsetY="23" verticalCenter="151" horizontalCenter="112">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" scaleX.down="0.9" scaleY.down="0.9" height="100%" source="guide1_btn_png" source.down="guide1_btn_png" source.disabled="guide1_btn_png"/> <e:Image width="100%" scaleX.down="0.9" scaleY.down="0.9" height="100%" source="guide1_btn_png" source.down="guide1_btn_png" source.disabled="guide1_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" horizontalCenter="79.5" source="商店_png" x="401"/> <e:Image verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" horizontalCenter="79.5" source="商店_png" x="401"/>
</e:Group> </e:Group>
<e:Group id="guide2" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false"> <e:Group id="guide2" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false">
<e:Image source="guide2_land_png" x="169" y="527"/> <e:Image source="guide2_land_png" x="169" y="527"/>
<e:Image id="guide2_tip" x="262" y="795" source="guide2_tip_png"/> <e:Image id="guide2_tip" x="262" y="795" source="guide2_tip_png"/>
<e:Button id="guide2_btn" label="" anchorOffsetY="23" anchorOffsetX="95" verticalCenter="119" horizontalCenter="112"> <e:Button id="guide2_btn" label="" anchorOffsetY="23" anchorOffsetX="95" verticalCenter="119" horizontalCenter="112">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="guide1_btn_png" source.down="guide1_btn_png" source.disabled="guide1_btn_png"/> <e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="guide1_btn_png" source.down="guide1_btn_png" source.disabled="guide1_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image source="仓库_btn_png" verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" horizontalCenter="-89.5" x="232"/> <e:Image source="仓库_btn_png" verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" horizontalCenter="-89.5" x="232"/>
</e:Group> </e:Group>
<e:Group id="guide3" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false"> <e:Group id="guide3" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" visible="false">
<e:Image id="guide3_tip" x="262" y="795" source="guide3_tip_png"/> <e:Image id="guide3_tip" x="262" y="795" source="guide3_tip_png"/>
<e:Button id="guide3_btn" label="" anchorOffsetX="95" anchorOffsetY="23.5" verticalCenter="118.5" horizontalCenter="112"> <e:Button id="guide3_btn" label="" anchorOffsetX="95" anchorOffsetY="23.5" verticalCenter="118.5" horizontalCenter="112">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="guide3_btn_png" source.down="guide3_btn_png" source.disabled="guide3_btn_png"/> <e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="guide3_btn_png" source.down="guide3_btn_png" source.disabled="guide3_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" source="任务_png" horizontalCenter="-258.5" x="63"/> <e:Image verticalCenter="484.5" y="1236" scaleX="1" scaleY="1" source="任务_png" horizontalCenter="-258.5" x="63"/>
</e:Group> </e:Group>
<e:Group id="guideFrog" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" touchChildren="false" touchEnabled="false"> <e:Group id="guideFrog" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624" touchChildren="false" touchEnabled="false">
<e:Group id="handGroup" x="460" y="1285" visible="false"> <e:Group id="handGroup" x="460" y="1285" visible="false">
<e:Image id="point" source="guide_point_png" x="21.5" y="21.5" anchorOffsetX="21.5" anchorOffsetY="21.5" alpha="0.9" scaleX="0.5" scaleY="0.5"/> <e:Image id="point" source="guide_point_png" x="21.5" y="21.5" anchorOffsetX="21.5" anchorOffsetY="21.5" alpha="0.9" scaleX="0.5" scaleY="0.5"/>
<e:Image id="hand" source="guide_hand_png" x="45" y="44"/> <e:Image id="hand" source="guide_hand_png" x="45" y="44"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Image id="cancel" source="guide_cancel_png" x="540" top="236"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/MainSceneSkin.exml
View file @ c814cdc9
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</e:Group> </e:Group>
<e:Group id="houseBtn" width="252" height="372" x="0" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="-383"> <e:Group id="houseBtn" width="252" height="372" x="0" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="-383">
</e:Group> </e:Group>
<e:Group id="xiaoEGroup" x="30" y="537" anchorOffsetX="0" anchorOffsetY="0" visible="false"> <e:Group id="xiaoEGroup" x="30" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="-148" visible="false">
<e:Image source="xiaoETip_bg_png" x="0" y="0"/> <e:Image source="xiaoETip_bg_png" x="0" y="0"/>
<e:Label text="哈喽小主人，你想了解哪些内容？" x="26" y="20" textColor="0x785332" size="24" bold="true"/> <e:Label text="哈喽小主人，你想了解哪些内容？" x="26" y="20" textColor="0x785332" size="24" bold="true"/>
<e:Scroller width="390" height="160" x="26" y="60"> <e:Scroller width="390" height="160" x="26" y="60">
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
</e:Group> </e:Group>
<e:Group id="xiaoEAnswer" x="30" y="537" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false" visible="false"> <e:Group id="xiaoEAnswer" x="30" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false" verticalCenter="-148" visible="false">
<e:Image source="xiaoETip_bg_png" x="0" y="0"/> <e:Image source="xiaoETip_bg_png" x="0" y="0"/>
<e:Label id="answerTitle" text="哈喽小主人，你想了解哪些内容？" x="26" y="20" size="24" bold="true" textColor="0x785332"/> <e:Label id="answerTitle" text="哈喽小主人，你想了解哪些内容？" x="26" y="20" size="24" bold="true" textColor="0x785332"/>
<e:Label id="answerTxt" text="" x="26" y="55" size="20" bold="true" anchorOffsetX="0" width="386" anchorOffsetY="0" height="132" textColor="0xe06200" verticalAlign="justify"/> <e:Label id="answerTxt" text="" x="26" y="55" size="20" bold="true" anchorOffsetX="0" width="386" anchorOffsetY="0" height="132" textColor="0xe06200" verticalAlign="justify"/>
......
egret/resource/skins/MainUISkin.exml
View file @ c814cdc9
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<e:Label id="waterNum" text="× 0" size="28" scaleX="1" scaleY="1" anchorOffsetX="0" right="0" width="108" anchorOffsetY="0" height="50" verticalAlign="middle" verticalCenter="0"/> <e:Label id="waterNum" text="× 0" size="28" scaleX="1" scaleY="1" anchorOffsetX="0" right="0" width="108" anchorOffsetY="0" height="50" verticalAlign="middle" verticalCenter="0"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group id="avatarPanel" x="26" width="278" height="81" anchorOffsetX="0" y="250"> <e:Group id="avatarPanel" x="26" width="278" height="81" anchorOffsetX="0" y="240">
<e:Image source="头像面板_png" x="0" y="0"/> <e:Image source="头像面板_png" x="0" y="0"/>
<e:Image id="avatarImg" source="默认头像_png" x="10" y="10" width="62" height="62"/> <e:Image id="avatarImg" source="默认头像_png" x="10" y="10" width="62" height="62"/>
<e:Image id="avatarMask" source="默认头像_png" x="10" y="10" width="62" height="62"/> <e:Image id="avatarMask" source="默认头像_png" x="10" y="10" width="62" height="62"/>
......
egret/src/Main.ts
View file @ c814cdc9
...@@ -17,7 +17,6 @@ import Bar from "./components/Bar"; ...@@ -17,7 +17,6 @@ import Bar from "./components/Bar";
import {NetManager} from "../libs/tw/manager/NetManager"; import {NetManager} from "../libs/tw/manager/NetManager";
import {Tools} from "./Tools"; import {Tools} from "./Tools";
import {showToast} from "./comm/UtilsConst"; import {showToast} from "./comm/UtilsConst";
import To = egret.tween.To;
let MainStage: egret.Stage = null; let MainStage: egret.Stage = null;
export {MainStage}; export {MainStage};
...@@ -108,7 +107,8 @@ class Main extends eui.UILayer { ...@@ -108,7 +107,8 @@ class Main extends eui.UILayer {
} }
await Tools.getQuestionList(); // 问题列表 await Tools.getQuestionList(); // 问题列表
await Tools.getMedalData(); // 问题列表 await Tools.getMedalData(); // 勋章数据
await Tools.gameGroupPrize(); // 游戏合集发奖
const areaPrice = await Tools.getAreaPrice(); const areaPrice = await Tools.getAreaPrice();
if (!areaPrice) { if (!areaPrice) {
......
egret/src/Panels/GameGroupPanel.ts
View file @ c814cdc9
import Panel from "../views/Panel"; import Panel from "../views/Panel";
import Tween = egret.Tween; import Tween = egret.Tween;
import Image = eui.Image; import Image = eui.Image;
import {NetManager} from "../../libs/tw/manager/NetManager";
import {GetProfitDetailData} from "../../libs/tw/data/customMade/GetProfitDetailData";
import {GDispatcher} from "../../libs/tc/util/GDispatcher";
import {Tools} from "../Tools";
import {MainIns} from "../Scenes/MainScene/MainScene";
export default class GameGroupPanel extends Panel { export default class GameGroupPanel extends Panel {
public closeBtn: Image; public closeBtn: Image;
...@@ -33,15 +38,25 @@ export default class GameGroupPanel extends Panel { ...@@ -33,15 +38,25 @@ export default class GameGroupPanel extends Panel {
} }
private onTap(e) { private onTap(e) {
switch (e.target) { NetManager.ins.gameGroupMark(() => {
case this.planeBtn:
break; GDispatcher.addEvent('docVisible', this.back, this);
switch (e.target) {
case this.planeBtn:
case this.clearBtn: break;
break; case this.clearBtn:
}
break;
}
});
}
async back() {
GDispatcher.removeEvent('docVisible', this.back, this);
await Tools.gameGroupPrize();
MainIns().mainUI.getPropInfo();
} }
protected start() { protected start() {
......
egret/src/Panels/Guide.ts
View file @ c814cdc9
...@@ -22,6 +22,9 @@ export default class Guide extends Panel { ...@@ -22,6 +22,9 @@ export default class Guide extends Panel {
public point: eui.Image; public point: eui.Image;
public hand: eui.Image; public hand: eui.Image;
public cancel: eui.Image;
public get skinKey() { public get skinKey() {
return 'Guide' return 'Guide'
} }
...@@ -62,6 +65,7 @@ export default class Guide extends Panel { ...@@ -62,6 +65,7 @@ export default class Guide extends Panel {
[this.guide1_btn, this.onTap, this], [this.guide1_btn, this.onTap, this],
[this.guide2_btn, this.onTap, this], [this.guide2_btn, this.onTap, this],
[this.guide3_btn, this.onTap, this], [this.guide3_btn, this.onTap, this],
[this.cancel, this.onTap, this],
]); ]);
} }
...@@ -79,6 +83,7 @@ export default class Guide extends Panel { ...@@ -79,6 +83,7 @@ export default class Guide extends Panel {
this.showHand(120); this.showHand(120);
break; break;
case this.cancel:
case this.guide3_btn: case this.guide3_btn:
const popup = this.data.call(); const popup = this.data.call();
popup ? 0 : (this.hidePanel(), this.data.f()); popup ? 0 : (this.hidePanel(), this.data.f());
......
egret/src/Scenes/MainScene/MainUI.ts
View file @ c814cdc9
...@@ -20,7 +20,6 @@ import Guide from "../../Panels/Guide"; ...@@ -20,7 +20,6 @@ import Guide from "../../Panels/Guide";
import ShopPanel from "../../Panels/ShopPanel"; import ShopPanel from "../../Panels/ShopPanel";
import TopLayerCtrl from "../../ctrls/topLayerCtrl"; import TopLayerCtrl from "../../ctrls/topLayerCtrl";
import {Tools} from "../../Tools"; import {Tools} from "../../Tools";
import To = egret.tween.To;
export let propData = { export let propData = {
sp_food_1: {name: 'food',}, sp_food_1: {name: 'food',},
...@@ -127,10 +126,6 @@ export default class MainUI extends ComponentBase { ...@@ -127,10 +126,6 @@ export default class MainUI extends ComponentBase {
case this.shopBtn: // 商店 case this.shopBtn: // 商店
NetManager.ins.clickLog(getlogItem(5)); // 商店点击埋点 NetManager.ins.clickLog(getlogItem(5)); // 商店点击埋点
// G_UpdateHomeData().then(() => {
// SceneCtrl.instance.change(ModuleTypes.SHOP_SCENE);
// });
PanelCtrl.instance.show(ShopPanel); PanelCtrl.instance.show(ShopPanel);
break; break;
......
egret/src/Scenes/RoomScene/Medal.ts
View file @ c814cdc9
import {getSkinPath} from "../../utils"; import {getSkinPath} from "../../utils";
import TouchEvent = egret.TouchEvent; import TouchEvent = egret.TouchEvent;
import PanelCtrl from "../../ctrls/panelCtrl";
import MedalPanel from "../../Panels/MedalPanel";
import TopLayerCtrl from "../../ctrls/topLayerCtrl"; import TopLayerCtrl from "../../ctrls/topLayerCtrl";
import {ModuleTypes} from "../../types/sceneTypes"; import {ModuleTypes} from "../../types/sceneTypes";
......
egret/src/Tools.ts
View file @ c814cdc9
...@@ -113,6 +113,7 @@ export class Tools { ...@@ -113,6 +113,7 @@ export class Tools {
return new Promise((resolve) => { return new Promise((resolve) => {
NetManager.ins.achieves((success, res) => { NetManager.ins.achieves((success, res) => {
if (!success) { if (!success) {
resolve(false);
return; return;
} }
...@@ -129,10 +130,19 @@ export class Tools { ...@@ -129,10 +130,19 @@ export class Tools {
res.data.forEach((v) => { res.data.forEach((v) => {
Tools.medalData[v.spId] = v; Tools.medalData[v.spId] = v;
}); });
resolve(true);
}); });
}); });
} }
public static gameGroupPrize() {
return new Promise((resolve) => {
NetManager.ins.gameGroupPrize(() => {
resolve(true);
});
});
}
/** /**
* 扣积分流程 * 扣积分流程
......
mock/config.js
View file @ c814cdc9
...@@ -294,7 +294,7 @@ const config = { ...@@ -294,7 +294,7 @@ const config = {
'/projectx/{projectId}/strategyRecords.query': { '/projectx/{projectId}/strategyRecords.query': {
data: './projectX/strategyRecords.json' data: './projectX/strategyRecords.json'
}, },
'/projectx/{projectId}/records.query':{ '/projectx/{projectId}/records.query': {
data: './projectX/queryRecords.json' data: './projectX/queryRecords.json'
}, },
...@@ -359,6 +359,12 @@ const config = { ...@@ -359,6 +359,12 @@ const config = {
'/projectx/{projectId}/join_1/achieves.do': { '/projectx/{projectId}/join_1/achieves.do': {
data: './joyousManor/achieves.json' data: './joyousManor/achieves.json'
}, },
'/projectx/{projectId}/game/mark.do': {
data: './game/mark.do.json'
},
'/projectx/{projectId}/game/join.do': {
data: './game/join.do.json'
},
}; };
......
mock/game/join.do.json 0 → 100644
View file @ c814cdc9
{
"success": true,
"message": "",
"code": "",
"data": null
}
\ No newline at end of file
mock/game/mark.do.json 0 → 100644
View file @ c814cdc9
{
"success": true,
"message": "",
"code": "",
"data": null
}
\ No newline at end of file
mock/projectX/getUserSpList.json
View file @ c814cdc9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"sp_6": 0, "sp_6": 0,
"sp_food_1": 100, "sp_food_1": 100,
"sp_food_2": 100, "sp_food_2": 100,
"sp_prop_1": 100, "sp_prop_1": 0,
"sp_task_1": 10, "sp_task_1": 10,
"sp_task_2": 100, "sp_task_2": 100,
"sp_achv_1": 0, "sp_achv_1": 0,
......
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