egret/src/mapScene · abc443bbff77e37984b562b9070243d40840115d · 王鸿源 / xiaoxiaole · GitLab

History Find file

Merge branch '冰下动物' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map · abc443bb
zjz1994 authored May 19, 2020
```
# Conflicts:
#	egret/index.html
#	egret/resource/skins/Main2Skin.exml
#	mock/happyclear/home.json
合并冰下动物
```
abc443bb

Name	Last commit	Last update
..
icon		Loading commit data...
AdSmallComp.ts		Loading commit data...
AvatarComp.ts		Loading commit data...
CountDown.ts		Loading commit data...
GuideCon.ts		Loading commit data...
MapBottomPart.ts		Loading commit data...
MapRpeatPart.ts		Loading commit data...
MapScene.ts		Loading commit data...
MapStarComp.ts		Loading commit data...
MapTopPart.ts		Loading commit data...
RankFriendList.ts		Loading commit data...
RedBagAni.ts		Loading commit data...
getAdBtn.ts		Loading commit data...
getIconGroup.ts		Loading commit data...
getInviteBtn.ts		Loading commit data...
getSignBtn.ts		Loading commit data...