Skip to content

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

修改轮播文案，并且变大一点

parent 16f42adb
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 35 deletions
.idea/workspace.xml
View file @ 64f07581
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="91d65b22-e37e-4b17-b43e-cdc81b9fe6ff" name="Default Changelist" comment="去掉鸡的免费送到家牌子"> <list default="true" id="91d65b22-e37e-4b17-b43e-cdc81b9fe6ff" name="Default Changelist" comment="去掉水稻的免费送到家牌子">
<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/src/Panels/ShopPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/ShopPanel.ts" 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/Panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<recent name="$PROJECT_DIR$/egret" /> <recent name="$PROJECT_DIR$/egret" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.build">
<configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true"> <configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true">
<method v="2" /> <method v="2" />
</configuration> </configuration>
...@@ -172,8 +172,8 @@ ...@@ -172,8 +172,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.buildExml" /> <item itemvalue="npm.buildExml" />
</list> </list>
...@@ -305,14 +305,8 @@ ...@@ -305,14 +305,8 @@
<workItem from="1616650815558" duration="236000" /> <workItem from="1616650815558" duration="236000" />
<workItem from="1616726563592" duration="2909000" /> <workItem from="1616726563592" duration="2909000" />
<workItem from="1617241624365" duration="1077000" /> <workItem from="1617241624365" duration="1077000" />
<workItem from="1617791003651" duration="156000" /> <workItem from="1617791003651" duration="1089000" />
</task> <workItem from="1618222309726" duration="1717000" />
<task id="LOCAL-00010" summary="新人刷新道具">
<created>1603852314464</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1603852314464</updated>
</task> </task>
<task id="LOCAL-00011" summary="新人刷新道具"> <task id="LOCAL-00011" summary="新人刷新道具">
<created>1603854998590</created> <created>1603854998590</created>
...@@ -650,7 +644,14 @@ ...@@ -650,7 +644,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1617242693075</updated> <updated>1617242693075</updated>
</task> </task>
<option name="localTasksCounter" value="59" /> <task id="LOCAL-00059" summary="去掉水稻的免费送到家牌子">
<created>1617791224279</created>
<option name="number" value="00059" />
<option name="presentableId" value="LOCAL-00059" />
<option name="project" value="LOCAL" />
<updated>1617791224279</updated>
</task>
<option name="localTasksCounter" value="60" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -671,7 +672,6 @@ ...@@ -671,7 +672,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="fk" />
<MESSAGE value="新人刷新道具" /> <MESSAGE value="新人刷新道具" />
<MESSAGE value="对svga videoItem做缓存" /> <MESSAGE value="对svga videoItem做缓存" />
<MESSAGE value="优化仓库" /> <MESSAGE value="优化仓库" />
...@@ -696,6 +696,7 @@ ...@@ -696,6 +696,7 @@
<MESSAGE value="小e" /> <MESSAGE value="小e" />
<MESSAGE value="Default Changelist" /> <MESSAGE value="Default Changelist" />
<MESSAGE value="去掉鸡的免费送到家牌子" /> <MESSAGE value="去掉鸡的免费送到家牌子" />
<option name="LAST_COMMIT_MESSAGE" value="去掉鸡的免费送到家牌子" /> <MESSAGE value="去掉水稻的免费送到家牌子" />
<option name="LAST_COMMIT_MESSAGE" value="去掉水稻的免费送到家牌子" />
</component> </component>
</project> </project>
\ No newline at end of file
egret/resource/skins/MainUISkin.exml
View file @ 64f07581
...@@ -16,18 +16,18 @@ ...@@ -16,18 +16,18 @@
<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="240"> <e:Group id="avatarPanel" x="26" width="278" height="81" anchorOffsetX="0" y="253">
<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"/>
<e:Label id="userName" text="欢趣使者" x="79.5" y="18.16" size="20" textColor="0x8f6846"/> <e:Label id="userName" text="欢趣使者" x="79.5" y="18.16" size="20" textColor="0x8f6846"/>
<e:Label id="userGold" text="欢趣豆：0" x="79.5" y="46.83" size="20" textColor="0x8f6846" anchorOffsetX="0" width="174" textAlign="left" wordWrap="false"/> <e:Label id="userGold" text="欢趣豆：0" x="79.5" y="46.83" size="20" textColor="0x8f6846" anchorOffsetX="0" width="174" textAlign="left" wordWrap="false"/>
<e:Image id="medal" source="勋章_png" x="44" y="49" visible="false"/> <e:Image id="medal" source="勋章_png" x="44" y="49" visible="false"/>
<e:Group id="tipGroup" x="229" y="-57" scaleX="1" scaleY="1" anchorOffsetX="0" width="461" height="36"> <e:Group id="tipGroup" x="229" y="-50" scaleX="1" scaleY="1" anchorOffsetX="0" width="461" height="36">
<e:Image source="广播__m_png" verticalCenter="0" horizontalCenter="0"/> <e:Image source="广播__m_png" verticalCenter="0" horizontalCenter="0"/>
<e:Group id="tipLabelGroup" x="44" width="417" height="36" verticalCenter="0"> <e:Group id="tipLabelGroup" x="44" width="417" height="36" verticalCenter="0">
<e:Label id="tipLabel1" text="农作物价格会根据总库存情况发生价格波动，每日出售价格以系统实际展示价格为准。" x="418" size="20" width="860" textAlign="center" y="2.5" verticalAlign="middle" height="36"/> <e:Label id="tipLabel1" text="兑换商品每日最终成交数量会随市场价格进行上下波动，每日兑换所需数量请以系统实际展示为准。" x="418" size="20" width="900" textAlign="center" y="2.5" verticalAlign="middle" height="36" wordWrap="false"/>
<e:Label id="tipLabel2" text="农作物价格会根据总库存情况发生价格波动，每日出售价格以系统实际展示价格为准。" x="1278" size="20" width="860" textAlign="center" y="2.5" verticalAlign="middle" height="36"/> <e:Label id="tipLabel2" text="兑换商品每日最终成交数量会随市场价格进行上下波动，每日兑换所需数量请以系统实际展示为准。" x="1278" size="20" width="900" textAlign="center" y="2.5" verticalAlign="middle" height="36" wordWrap="false"/>
</e:Group> </e:Group>
<e:Rect id="tipLabelMask" width="417" height="36" x="44" y="0"/> <e:Rect id="tipLabelMask" width="417" height="36" x="44" y="0"/>
</e:Group> </e:Group>
......
egret/src/Scenes/MainScene/MainUI.ts
View file @ 64f07581
...@@ -23,6 +23,7 @@ import {getlogItem} from "../../comm/getlogItem"; ...@@ -23,6 +23,7 @@ import {getlogItem} from "../../comm/getlogItem";
import {NetName} from "../../../libs/tw/enum/NetName"; import {NetName} from "../../../libs/tw/enum/NetName";
import {getToken} from "./Const"; import {getToken} from "./Const";
import {wait} from "../../comm/GameConst"; import {wait} from "../../comm/GameConst";
import Event = egret.Event;
export let propData = { export let propData = {
sp_food_1: {name: 'food',}, sp_food_1: {name: 'food',},
...@@ -167,10 +168,9 @@ export default class MainUI extends ComponentBase { ...@@ -167,10 +168,9 @@ export default class MainUI extends ComponentBase {
this.tip1 = this.tipLabel1; this.tip1 = this.tipLabel1;
this.tip2 = this.tipLabel2; this.tip2 = this.tipLabel2;
this.tipLabel(18375); // this.tipLabel(18375);
this.getUserInfo(); this.getUserInfo();
// this.getGoldNum();
await this.getPropInfoByBI(); await this.getPropInfoByBI();
// console.log(G_GetHomeDataByKey(HOME.GOLD)); // console.log(G_GetHomeDataByKey(HOME.GOLD));
...@@ -184,22 +184,25 @@ export default class MainUI extends ComponentBase { ...@@ -184,22 +184,25 @@ export default class MainUI extends ComponentBase {
NetManager.ins.showLog(getlogItem(4)); NetManager.ins.showLog(getlogItem(4));
NetManager.ins.showLog(getlogItem(5)); NetManager.ins.showLog(getlogItem(5));
NetManager.ins.showLog(getlogItem(6)); NetManager.ins.showLog(getlogItem(6));
this.tipGroup.scaleX = 1.2;
this.tipGroup.scaleY = 1.2;
this.tipGroup.x -= 80;
this.addEventListener(Event.ENTER_FRAME, this.onUpdate, this);
} }
private tipLabel(duration) { private onUpdate() {
egret.Tween.get(this.tip1, { if (this.tip1 && this.tip2) {
onChange: () => { this.tip1.x--;
this.tip1 && this.tip2 && (this.tip2.x = this.tip1.x + this.tip1.width); this.tip2.x = this.tip1.x + this.tip1.width
}
}) if(this.tip1.x <= -860){
.to({x: -860}, duration) let temp = this.tip2;
.set({x: 1220})
.call(() => {
let x = this.tip2;
this.tip2 = this.tip1; this.tip2 = this.tip1;
this.tip1 = x; this.tip1 = temp;
this.tipLabel(duration); }
}); }
} }
public async addGold() { public async addGold() {
......
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