Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
elephant
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
template admin
elephant
Commits
8bdc7915
Commit
8bdc7915
authored
Jun 13, 2022
by
liujiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: pets
parent
34659f9a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
75 additions
and
57 deletions
+75
-57
changeSkin.ts
assets/elephant/scene/changeSkin.ts
+0
-1
elephant.fire
assets/elephant/scene/elephant.fire
+44
-44
elephant.ts
assets/elephant/scene/elephant.ts
+14
-7
house-item.ts
assets/elephant/scene/model/house-item.ts
+4
-2
house.ts
assets/elephant/scene/model/house.ts
+12
-2
shop.ts
assets/elephant/scene/model/shop.ts
+1
-1
No files found.
assets/elephant/scene/changeSkin.ts
View file @
8bdc7915
...
...
@@ -41,7 +41,6 @@ export default class ChangeItemAnimation extends cc.Component {
this
.
armatureDisplay
.
playAnimation
(
"
newAnimation
"
,
1
);
let
{
x
,
y
,
width
,
height
}
=
this
.
node
;
if
(
data
.
rect
)
{
debugger
x
=
data
.
rect
.
x
;
y
=
data
.
rect
.
y
;
width
=
data
.
rect
.
width
;
...
...
assets/elephant/scene/elephant.fire
View file @
8bdc7915
...
...
@@ -1605,7 +1605,7 @@
"__id__": 30
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 33
...
...
@@ -1890,7 +1890,7 @@
"__id__": 39
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 42
...
...
@@ -2382,7 +2382,7 @@
"__id__": 56
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 59
...
...
@@ -2918,7 +2918,7 @@
"__id__": 69
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 72
...
...
@@ -3203,7 +3203,7 @@
"__id__": 78
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 81
...
...
@@ -3488,7 +3488,7 @@
"__id__": 87
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 90
...
...
@@ -3773,7 +3773,7 @@
"__id__": 96
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 99
...
...
@@ -4058,7 +4058,7 @@
"__id__": 105
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 108
...
...
@@ -4333,7 +4333,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg_
lamp
",
"_name": "bg_
photo
",
"_objFlags": 0,
"_parent": {
"__id__": 67
...
...
@@ -4343,7 +4343,7 @@
"__id__": 114
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 117
...
...
@@ -4372,8 +4372,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width":
173
,
"height": 2
58
"width":
265
,
"height": 2
17
},
"_anchorPoint": {
"__type__": "cc.Vec2",
...
...
@@ -4384,8 +4384,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
384.059
,
-4.682999999999993
,
249.461
,
178.252
,
0,
0,
0,
...
...
@@ -4407,7 +4407,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
ffJ/dWovhG96ueZ8FUyejl
"
"_id": "
565Kv77/RBwYUFIogI4h2m
"
},
{
"__type__": "cc.Node",
...
...
@@ -4471,7 +4471,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
fac7XpyNpPEaJa4KXlhCB2
"
"_id": "
8f6ymxyyRCN7mSWwDMhHVP
"
},
{
"__type__": "dragonBones.ArmatureDisplay",
...
...
@@ -4511,7 +4511,7 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "a
0VOJxdkhELZHpCeGklHhq
"
"_id": "a
7pMNVx0REbYxguJHr5XQr
"
},
{
"__type__": "cc.PrefabInfo",
...
...
@@ -4540,7 +4540,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "
1b376b4d-fce0-416d-981b-85726dc8d4b2
"
"__uuid__": "
555a92c7-617e-4ebd-8a20-28b08a3d5817
"
},
"_type": 0,
"_sizeMode": 1,
...
...
@@ -4554,7 +4554,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "
2eYkmIROpHDqdcHikIy4Mo
"
"_id": "
85wth9OsdKUYzYFLJgjdas
"
},
{
"__type__": "cc.Widget",
...
...
@@ -4566,11 +4566,11 @@
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags":
4
,
"_alignFlags":
0
,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom":
241.317
,
"_bottom":
444.752
,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
...
...
@@ -4581,7 +4581,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "
3648XFsSpIh4B61sgsgBlQ
"
"_id": "
263/lMGrZJhpS7YgeQdOCk
"
},
{
"__type__": "a0c42HFVrlAzI/8g9Wlsc+q",
...
...
@@ -4591,7 +4591,7 @@
"__id__": 113
},
"_enabled": true,
"_id": "
d6D2hxaNNGoYF5mWLtpJvG
"
"_id": "
f6N/RB1N1JGY8OGBiuGxEf
"
},
{
"__type__": "cc.BlockInputEvents",
...
...
@@ -4601,7 +4601,7 @@
"__id__": 113
},
"_enabled": true,
"_id": "
fcb/M/0UpP/bVP4hR17O2w
"
"_id": "
cdHYtihwtKIoeWs8xEofWu
"
},
{
"__type__": "f9a5c5c6NpCFaKuCHIv6tRO",
...
...
@@ -4614,11 +4614,11 @@
"starPopAudio": {
"__uuid__": "82aa8d86-812e-48a6-b9f6-b5ef748f1719"
},
"_id": "
9atxOjCxtMtZ3IJMi6l6Og
"
"_id": "
d3chnR4aZLrrtj21MG1jmm
"
},
{
"__type__": "cc.Node",
"_name": "bg_
photo
",
"_name": "bg_
lamp
",
"_objFlags": 0,
"_parent": {
"__id__": 67
...
...
@@ -4628,7 +4628,7 @@
"__id__": 123
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 126
...
...
@@ -4657,8 +4657,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width":
265
,
"height": 2
17
"width":
173
,
"height": 2
58
},
"_anchorPoint": {
"__type__": "cc.Vec2",
...
...
@@ -4669,8 +4669,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
249.461
,
178.252
,
384.059
,
-4.682999999999993
,
0,
0,
0,
...
...
@@ -4692,7 +4692,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
565Kv77/RBwYUFIogI4h2m
"
"_id": "
ffJ/dWovhG96ueZ8FUyejl
"
},
{
"__type__": "cc.Node",
...
...
@@ -4756,7 +4756,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
8f6ymxyyRCN7mSWwDMhHVP
"
"_id": "
fac7XpyNpPEaJa4KXlhCB2
"
},
{
"__type__": "dragonBones.ArmatureDisplay",
...
...
@@ -4796,7 +4796,7 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "a
7pMNVx0REbYxguJHr5XQr
"
"_id": "a
0VOJxdkhELZHpCeGklHhq
"
},
{
"__type__": "cc.PrefabInfo",
...
...
@@ -4825,7 +4825,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "
555a92c7-617e-4ebd-8a20-28b08a3d5817
"
"__uuid__": "
1b376b4d-fce0-416d-981b-85726dc8d4b2
"
},
"_type": 0,
"_sizeMode": 1,
...
...
@@ -4839,7 +4839,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "
85wth9OsdKUYzYFLJgjdas
"
"_id": "
2eYkmIROpHDqdcHikIy4Mo
"
},
{
"__type__": "cc.Widget",
...
...
@@ -4851,11 +4851,11 @@
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags":
0
,
"_alignFlags":
4
,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom":
444.752
,
"_bottom":
241.317
,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
...
...
@@ -4866,7 +4866,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "
263/lMGrZJhpS7YgeQdOCk
"
"_id": "
3648XFsSpIh4B61sgsgBlQ
"
},
{
"__type__": "a0c42HFVrlAzI/8g9Wlsc+q",
...
...
@@ -4876,7 +4876,7 @@
"__id__": 122
},
"_enabled": true,
"_id": "
f6N/RB1N1JGY8OGBiuGxEf
"
"_id": "
d6D2hxaNNGoYF5mWLtpJvG
"
},
{
"__type__": "cc.BlockInputEvents",
...
...
@@ -4886,7 +4886,7 @@
"__id__": 122
},
"_enabled": true,
"_id": "
cdHYtihwtKIoeWs8xEofWu
"
"_id": "
fcb/M/0UpP/bVP4hR17O2w
"
},
{
"__type__": "f9a5c5c6NpCFaKuCHIv6tRO",
...
...
@@ -4899,7 +4899,7 @@
"starPopAudio": {
"__uuid__": "82aa8d86-812e-48a6-b9f6-b5ef748f1719"
},
"_id": "
d3chnR4aZLrrtj21MG1jmm
"
"_id": "
9atxOjCxtMtZ3IJMi6l6Og
"
},
{
"__type__": "cc.Widget",
...
...
@@ -26908,7 +26908,7 @@
"__id__": 55
},
"lamp": {
"__id__": 1
13
"__id__": 1
22
},
"carpet": {
"__id__": 68
...
...
@@ -26926,7 +26926,7 @@
"__id__": 104
},
"photo": {
"__id__": 1
22
"__id__": 1
13
},
"starPop": null,
"_id": "52c251abcdd44956b72965"
...
...
assets/elephant/scene/elephant.ts
View file @
8bdc7915
...
...
@@ -230,12 +230,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg
.
view
.
touchOn
(
this
.
exitButton
,
this
.
onExitPetRoom
,
this
);
}
renderMyHouse
()
{
console
.
log
(
'
house
'
,
user
.
myFurniture
);
const
fur_kinds
=
Object
.
keys
(
user
.
myFurniture
.
furniture
);
const
self
=
this
;
fur_kinds
.
forEach
(
kind
=>
{
const
fur
=
user
.
myFurniture
.
furniture
[
kind
];
console
.
log
(
kind
,
fur
.
id
,
fur
.
rect
);
house
.
setFurnitureItem
(
this
[
kind
],
fur
.
id
,
fur
.
rect
);
house
.
setFurnitureItem
(
self
[
kind
],
fur
.
id
,
fur
.
rect
);
});
}
//----------------------------商店部分--------------------------------------
...
...
@@ -245,8 +244,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
// 换装相关
onTouchItemToChange
(
kind
){
//
console.log('house', house.list);
//
console.log('change', kind);
console
.
log
(
'
house
'
,
house
.
list
);
console
.
log
(
'
change
'
,
kind
);
this
.
updateMyHouseItemsListView
(
kind
);
this
.
skin_choice_dialog
.
active
=
true
;
}
...
...
@@ -407,8 +406,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let
discount
=
pg
.
view
.
find
(
item
,
"
bg_food/discount
"
);
let
btn_buy
=
pg
.
view
.
find
(
item
,
"
bg_food/btn_buy
"
);
if
(
data
.
type
==
ITEM_TYPE
.
HOUSE
&&
(
data
as
HouseItem
).
own
)
{
console
.
log
(
1
,
data
);
if
(
data
.
type
==
ITEM_TYPE
.
HOUSE
&&
(
data
as
HouseItem
).
num
>
0
)
{
let
own
=
pg
.
view
.
find
(
item
,
"
bg_food/own
"
);
pg
.
view
.
visible
(
own
,
true
);
}
...
...
@@ -463,6 +461,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this
.
openTipNormal
(
data
,
()
=>
{
action
(
data
);
this
.
closeTipNormal
();
},
()
=>
{
this
.
closeTipNormal
();
})
...
...
@@ -476,6 +475,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
buy
(
data
)
{
this
.
showWaitingLetters
();
console
.
log
(
'
buy
'
,
data
)
Api
.
askBuyItem
(
data
).
then
((
resp
)
=>
{
this
.
fetchUserData
().
then
(
ud
=>
{
this
.
hideWaitingLetters
(
true
)
...
...
@@ -484,6 +484,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
this
.
updateShopBtns
();
this
.
openTipBuy
(
data
,
()
=>
{
this
.
closeTipBuy
();
if
(
data
.
type
==
ITEM_TYPE
.
HOUSE
)
{
this
.
openTipAlert
({
message
:
'
长按家具,可以更换装扮哦~
'
,
callback
:
()
=>
{
this
.
closeTipAlert
();
}
})
}
});
}).
catch
(
e
=>
{
this
.
hideWaitingLetters
(
true
);
...
...
assets/elephant/scene/model/house-item.ts
View file @
8bdc7915
...
...
@@ -2,9 +2,10 @@ import Item from "./item";
class
HouseItem
extends
Item
{
public
itemImage
:
string
;
//
public
kind
:
string
;
// 商品种类
public
own
:
boolean
;
//
public own: boolean;
public
rect
:
{
x
:
number
,
y
:
number
,
width
:
number
,
height
:
number
}
public
current
=
false
;
public
defaultId
:
number
;
constructor
(
obj
:
any
)
{
super
(
obj
);
// if (obj.type == 1) {
...
...
@@ -17,8 +18,9 @@ class HouseItem extends Item {
if
(
obj
.
meta_value
&&
obj
.
meta_value
.
item
)
{
this
.
itemImage
=
obj
.
meta_value
.
item
;
}
this
.
own
=
obj
.
amount
>
0
;
// this.num = obj.amount
;
this
.
rect
=
obj
.
meta_value
.
rect
;
this
.
defaultId
=
obj
.
defaultId
;
// console.log(222, obj)
}
}
...
...
assets/elephant/scene/model/house.ts
View file @
8bdc7915
...
...
@@ -26,8 +26,18 @@ class House {
return
this
.
_list
.
findIndex
(
it
=>
it
.
id
==
item_id
)
>
-
1
;
}
setFurnitureItem
(
node
,
id
,
rect
=
null
)
{
const
item
=
this
.
_list
.
find
(
li
=>
li
.
id
==
id
)
pg
.
view
.
setNetImg
(
node
,
item
.
itemImage
,
true
);
const
item
=
this
.
_list
.
find
(
li
=>
li
.
id
==
id
);
// if (!item) {
// item = this._list.find(li => {
// return li.defaultId == id
// });;
// }
if
(
!
item
)
{
return
;
}
pg
.
view
.
setNetImg
(
node
,
item
.
itemImage
,
true
).
then
(()
=>
{
node
.
active
=
true
;
});
if
(
rect
)
{
node
.
x
=
rect
.
x
;
node
.
y
=
rect
.
y
;
...
...
assets/elephant/scene/model/shop.ts
View file @
8bdc7915
...
...
@@ -24,7 +24,7 @@ class Shop {
return
li
.
type
==
type
&&
!
[
20
,
21
,
22
,
23
,
24
,
25
,
26
,
27
,
28
,
29
,
30
].
includes
(
li
.
id
);
}).
map
(
li
=>
{
if
(
li
.
type
==
2
)
{
return
{...
li
,
own
:
house
.
has
(
li
.
id
)}
return
{...
li
,
num
:
(
house
.
has
(
li
.
id
)
?
1
:
0
)}
}
return
li
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment