Commits · 3695f0d07068a68a2b8576897bc2b8037c270dea · 王鸿源 / xiaoxiaole

07 Apr, 2020 2 commits
- 调整时虚拟物品时的显示上移 · 3695f0d0
  zjz1994 authored Apr 07, 2020
  
  3695f0d0
- 默认关卡1 · c22bb538
  zjz1994 authored Apr 07, 2020
  
  c22bb538
03 Apr, 2020 23 commits
- 新增体力抽奖的埋点 · 5ab6f899
  zjz1994 authored Apr 03, 2020
  
  5ab6f899
- 1 · 75bf3fbe
  wildfirecode authored Apr 03, 2020
  
  75bf3fbe
- 1 · c1fc2956
  wildfirecode authored Apr 03, 2020
  
  c1fc2956
- 1 · 89af0506
  wildfirecode authored Apr 03, 2020
  
  89af0506
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · c8e02388
  zjz1994 authored Apr 03, 2020
  
  c8e02388
- 新增签到资源 · 1385c9da
  zjz1994 authored Apr 03, 2020
  
  1385c9da
- 1 · c7971af9
  邱旭 authored Apr 03, 2020
  
  c7971af9
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 2eaabb8a
  zjz1994 authored Apr 03, 2020
  
  2eaabb8a
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · b1ea179e
  wildfirecode authored Apr 03, 2020
  
  b1ea179e
- 1 · 9026ec28
  wildfirecode authored Apr 03, 2020
  
  9026ec28
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · ff9cc11a
  zjz1994 authored Apr 03, 2020
```
# Conflicts:
#	egret/resource/default.res.json
合并
```
  ff9cc11a
- 新增签到资源 · 68a91829
  zjz1994 authored Apr 03, 2020
  
  68a91829
- 调整签到 · e7acc37b
  zjz1994 authored Apr 03, 2020
  
  e7acc37b
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into · e3bf7fae
  邱旭 authored Apr 03, 2020
  
  e3bf7fae
- 1 · faca4cb5
  邱旭 authored Apr 03, 2020
  
  faca4cb5
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · 8392da50
  wildfirecode authored Apr 03, 2020
  
  8392da50
- 1 · b21ae6da
  wildfirecode authored Apr 03, 2020
  
  b21ae6da
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into de: · 15471ee4
  邱旭 authored Apr 03, 2020
  
  15471ee4
- 1 · abace456
  邱旭 authored Apr 03, 2020
  
  abace456
- 调整大转盘未中奖是的文案 · 1971175a
  zjz1994 authored Apr 03, 2020
  
  1971175a
- 1 · f8186d2e
  wildfirecode authored Apr 03, 2020
  
  f8186d2e
- 1 · bafe6b43
  wildfirecode authored Apr 03, 2020
  
  bafe6b43
- 签到奖励对应 · 432ac67c
  zjz1994 authored Apr 03, 2020
  
  432ac67c
02 Apr, 2020 15 commits
- 修改签到界面第七天不能连续弹出 · 06e4d8b1
  zjz1994 authored Apr 02, 2020
  
  06e4d8b1
- 1 · dd42a3b4
  邱旭 authored Apr 02, 2020
  
  dd42a3b4
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · af18ae1a
  邱旭 authored Apr 02, 2020
  
  af18ae1a
- 1 · 7bfd0ae3
  邱旭 authored Apr 02, 2020
  
  7bfd0ae3
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 994e22eb
  zjz1994 authored Apr 02, 2020
  
  994e22eb
- 调整补充体力页面适配时的跳 · df5a7acd
  zjz1994 authored Apr 02, 2020
  
  df5a7acd
- 1 · e37398df
  wildfirecode authored Apr 02, 2020
  
  e37398df
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · f9e698e6
  邱旭 authored Apr 02, 2020
  
  f9e698e6
- 1 · 6ac1af1a
  邱旭 authored Apr 02, 2020
  
  6ac1af1a
- 1 · 98b3b89e
  wildfirecode authored Apr 02, 2020
  
  98b3b89e
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · 94e89bb1
  wildfirecode authored Apr 02, 2020
  
  94e89bb1
- 1 · 187e06bc
  wildfirecode authored Apr 02, 2020
  
  187e06bc
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 04b776dc
  zjz1994 authored Apr 02, 2020
  
  04b776dc
- 新增旋转光 · e1f2a46f
  zjz1994 authored Apr 02, 2020
  
  e1f2a46f
- 1 · b03a492e
  邱旭 authored Apr 02, 2020
  
  b03a492e