Commits · c770278dd8854c649756fcec1d6d3a65ec65c184 · 王鸿源 / xiaoxiaole

02 Apr, 2020 7 commits
- 1 · c770278d
  邱旭 authored Apr 02, 2020
  
  c770278d
- 1 · 693f5b34
  邱旭 authored Apr 02, 2020
  
  693f5b34
- 1 · 8d2b6dd0
  邱旭 authored Apr 02, 2020
  
  8d2b6dd0
- 代码暂存 · 0a66bd0a
  zjz1994 authored Apr 02, 2020
  
  0a66bd0a
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 9bb78085
  zjz1994 authored Apr 02, 2020
  
  9bb78085
- 签到奖励暂存 · 3b062717
  zjz1994 authored Apr 02, 2020
  
  3b062717
- 1 · ec10cbeb
  邱旭 authored Apr 02, 2020
  
  ec10cbeb
01 Apr, 2020 22 commits
- 签到动效调整 · 312b26d0
  zjz1994 authored Apr 01, 2020
  
  312b26d0
- 加光旋转 · 84cac247
  zjz1994 authored Apr 01, 2020
  
  84cac247
- 签到位置暂存 · d1a3df08
  zjz1994 authored Apr 01, 2020
  
  d1a3df08
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · f41e78e0
  zjz1994 authored Apr 01, 2020
  
  f41e78e0
- 签到调整 · e02c95f0
  zjz1994 authored Apr 01, 2020
  
  e02c95f0
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · 5b4cdf2b
  wildfirecode authored Apr 01, 2020
  
  5b4cdf2b
- 1 · 014a56da
  wildfirecode authored Apr 01, 2020
  
  014a56da
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 2c9388be
  zjz1994 authored Apr 01, 2020
  
  2c9388be
- 签到暂存 · e868c5ea
  zjz1994 authored Apr 01, 2020
  
  e868c5ea
- 1 · 9ababadc
  wildfirecode authored Apr 01, 2020
  
  9ababadc
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · bb40f76a
  zjz1994 authored Apr 01, 2020
  
  bb40f76a
- 修改签到 · 32927ec3
  zjz1994 authored Apr 01, 2020
  
  32927ec3
- 1 · 8a20bc78
  wildfirecode authored Apr 01, 2020
  
  8a20bc78
- 1 · d6c47c6e
  wildfirecode authored Apr 01, 2020
  
  d6c47c6e
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · ea87f682
  wildfirecode authored Apr 01, 2020
  
  ea87f682
- 1 · 3ca40377
  wildfirecode authored Apr 01, 2020
  
  3ca40377
- 1 · 11ab032c
  邱旭 authored Apr 01, 2020
  
  11ab032c
- 1 · 3aece265
  邱旭 authored Apr 01, 2020
  
  3aece265
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · d4bd92ec
  zjz1994 authored Apr 01, 2020
  
  d4bd92ec
- 签到暂存 · 8b21158f
  zjz1994 authored Apr 01, 2020
  
  8b21158f
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 9d919a69
  邱旭 authored Apr 01, 2020
  
  9d919a69
- 1 · 02587b60
  邱旭 authored Apr 01, 2020
  
  02587b60
31 Mar, 2020 11 commits
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 6098d066
  zjz1994 authored Mar 31, 2020
  
  6098d066
- 签到暂存 · b7ff5a25
  zjz1994 authored Mar 31, 2020
  
  b7ff5a25
- 1 · dcb761f0
  邱旭 authored Mar 31, 2020
  
  dcb761f0
- Merge branch 'hotfix20200331' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · bc8c74a6
  zjz1994 authored Mar 31, 2020
  
  bc8c74a6
- 调整特效充能 · af59f284
  zjz1994 authored Mar 31, 2020
  
  af59f284
- Merge branch 'hotfix20200331' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · d873950a
  zjz1994 authored Mar 31, 2020
```
# Conflicts:
#	egret/publish.js
#	egret/resource/TextureMerger/main2.tmproject
#	egret/resource/default.res.json
#	egret/src/mainScene/MainScene.ts
合并新元素
```
  d873950a
- 代码暂存 · 6ac6d481
  zjz1994 authored Mar 31, 2020
  
  6ac6d481
- 体力获取有无转盘奖励 · 38625b7b
  zjz1994 authored Mar 31, 2020
  
  38625b7b
- Merge branch 'hotfix20200331_' of... · e112bb69
  zjz1994 authored Mar 31, 2020
```
Merge branch 'hotfix20200331_' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into hotfix20200331

# Conflicts:

#	egret/src/something/chapters/Chapter22.ts
合并master
```
  e112bb69
- 特效充能暂存 · 13da983c
  zjz1994 authored Mar 31, 2020
  
  13da983c
- 代码暂存 · 722fd25f
  zjz1994 authored Mar 31, 2020
  
  722fd25f