Commits · 56df5bebf71e95def2b078babeedc3889c6828ce · 王鸿源 / xiaoxiaole

09 Apr, 2020 13 commits
- 减少猩猩解除束缚的时间 · 56df5beb
  zjz1994 authored Apr 09, 2020
  
  56df5beb
- 调整大炮相关资源 · 3b13721b
  zjz1994 authored Apr 09, 2020
  
  3b13721b
- 炮台充能一次发射不再分步发射了 · a92d1c64
  zjz1994 authored Apr 09, 2020
  
  a92d1c64
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩 · fb354627
  zjz1994 authored Apr 09, 2020
  
  fb354627
- 压缩音效 · d6980ab8
  zjz1994 authored Apr 09, 2020
  
  d6980ab8
- 修正音乐 · aebb3f7a
  zjz1994 authored Apr 09, 2020
  
  aebb3f7a
- 调整音乐 · 2f97b61a
  zjz1994 authored Apr 09, 2020
  
  2f97b61a
- 修改了595关卡记得改 · 0cb04be7
  zjz1994 authored Apr 09, 2020
  
  0cb04be7
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩 · aa83bfa6
  zjz1994 authored Apr 09, 2020
  
  aa83bfa6
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩 · 0c3e40b4
  zjz1994 authored Apr 09, 2020
```
# Conflicts:合并dev
#	egret/resource/default.res.json
#	egret/src/something/chapters/Chapter23.ts
#	egret/src/something/chapters/getChapter.ts
```
  0c3e40b4
- 1 · fb082ab0
  邱旭 authored Apr 09, 2020
  
  fb082ab0
- 猩猩大炮消除 · 8be57a8a
  zjz1994 authored Apr 09, 2020
  
  8be57a8a
- 签到兼容环境 · 12fcc476
  zjz1994 authored Apr 09, 2020
  
  12fcc476
08 Apr, 2020 27 commits
- 签到调整 · 61eab225
  zjz1994 authored Apr 08, 2020
  
  61eab225
- 调整关卡 · 517309e5
  zjz1994 authored Apr 08, 2020
  
  517309e5
- 1 · 3e38f841
  wildfirecode authored Apr 08, 2020
  
  3e38f841
- 猩猩的特效消除 · d2f51f38
  zjz1994 authored Apr 08, 2020
  
  d2f51f38
- 调整关卡 · 9ef0cb6e
  zjz1994 authored Apr 08, 2020
  
  9ef0cb6e
- 修改关卡 · dbccdaad
  zjz1994 authored Apr 08, 2020
  
  dbccdaad
- 炮台引导 · c7b9b764
  zjz1994 authored Apr 08, 2020
  
  c7b9b764
- Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev · dd34e744
  wildfirecode authored Apr 08, 2020
  
  dd34e744
- 1 · 34423508
  wildfirecode authored Apr 08, 2020
  
  34423508
- 新关卡 · 33d3fa00
  zjz1994 authored Apr 08, 2020
  
  33d3fa00
- 猩猩暂存 · f4b7962a
  zjz1994 authored Apr 08, 2020
  
  f4b7962a
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · efd8c0a8
  zjz1994 authored Apr 08, 2020
  
  efd8c0a8
- 1 · 10f875e1
  邱旭 authored Apr 08, 2020
  
  10f875e1
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 26eff192
  zjz1994 authored Apr 08, 2020
  
  26eff192
- 免费次数调整 · fcbc92fa
  zjz1994 authored Apr 08, 2020
  
  fcbc92fa
- 1 · c4159c21
  邱旭 authored Apr 08, 2020
  
  c4159c21
- 1 · 80c5a410
  邱旭 authored Apr 08, 2020
  
  80c5a410
- 1 · d2eef26b
  邱旭 authored Apr 08, 2020
  
  d2eef26b
- 1 · 8717944f
  邱旭 authored Apr 08, 2020
  
  8717944f
- 1 · 2c4bf2e8
  邱旭 authored Apr 08, 2020
  
  2c4bf2e8
- 1 · 2734ee49
  邱旭 authored Apr 08, 2020
  
  2734ee49
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 972d24db
  邱旭 authored Apr 08, 2020
  
  972d24db
- 1 · 94fe2918
  邱旭 authored Apr 08, 2020
  
  94fe2918
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 4082d894
  zjz1994 authored Apr 08, 2020
  
  4082d894
- 去掉签到和排行的背转光 · 7cb36692
  zjz1994 authored Apr 08, 2020
  
  7cb36692
- 1 · 9c1029dd
  邱旭 authored Apr 08, 2020
  
  9c1029dd
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 593af8ce
  zjz1994 authored Apr 08, 2020
  
  593af8ce