Commits · 221c7abc35b4f9562a33dcf0cb6814493071ed55 · 王鸿源 / xiaoxiaole

08 Apr, 2020 3 commits
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 221c7abc
  zjz1994 authored Apr 08, 2020
  
  221c7abc
- 修改 · 299db78a
  zjz1994 authored Apr 08, 2020
  
  299db78a
- 1 · 0a4a39b9
  邱旭 authored Apr 08, 2020
  
  0a4a39b9
07 Apr, 2020 18 commits
- 调整显示转盘抽奖券底黄图 · d46f4eca
  zjz1994 authored Apr 07, 2020
  
  d46f4eca
- 体力界面的时间间隙 · 2cb9c481
  zjz1994 authored Apr 07, 2020
  
  2cb9c481
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 3432e9d7
  zjz1994 authored Apr 07, 2020
  
  3432e9d7
- 代码暂存 · 0bbfc0b2
  zjz1994 authored Apr 07, 2020
  
  0bbfc0b2
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 8bbcbbe9
  邱旭 authored Apr 07, 2020
  
  8bbcbbe9
- 1 · e3e1299f
  邱旭 authored Apr 07, 2020
  
  e3e1299f
- 调整光 · 36731817
  zjz1994 authored Apr 07, 2020
  
  36731817
- 修改bug · e9d0d7b5
  zjz1994 authored Apr 07, 2020
  
  e9d0d7b5
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 69273086
  zjz1994 authored Apr 07, 2020
  
  69273086
- 调整资源 · d924246a
  zjz1994 authored Apr 07, 2020
  
  d924246a
- 1 · 041f40b8
  邱旭 authored Apr 07, 2020
  
  041f40b8
- 1 · 88f77a83
  邱旭 authored Apr 07, 2020
  
  88f77a83
- 1 · 95e96fe7
  邱旭 authored Apr 07, 2020
  
  95e96fe7
- 调整签到特效 · 60657823
  zjz1994 authored Apr 07, 2020
  
  60657823
- 调整资源，签到 · 59a842c5
  zjz1994 authored Apr 07, 2020
  
  59a842c5
- 签到位置 · cae7c42c
  zjz1994 authored Apr 07, 2020
  
  cae7c42c
- 调整时虚拟物品时的显示上移 · 3695f0d0
  zjz1994 authored Apr 07, 2020
  
  3695f0d0
- 默认关卡1 · c22bb538
  zjz1994 authored Apr 07, 2020
  
  c22bb538
03 Apr, 2020 19 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