Commits · master · HD / DWSDK

14 Mar, 2022 3 commits
- update reyun version · de4cd6a4
  HD authored 3 years ago
  
  de4cd6a4
- Merge branch 'master' into dev_merge_all · a62f8bb1
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/merge-all-rules.pro
#	GameSDK_API/src/main/assets/dwg_plugin_config.json
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	gradle.properties
```
  a62f8bb1
- Merge branch 'dev_general' into dev_merge_all · d1f953ad
  HD authored 3 years ago
  
  d1f953ad
11 Mar, 2022 1 commit
- add reyun · bc8612ea
  HD authored 3 years ago
  
  bc8612ea
01 Mar, 2022 2 commits
- Merge branch 'dev_general' into master · 89efeec2
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/merge-all-rules.pro
#	GameSDK_API/src/main/assets/dwg_version_config.json
```
  89efeec2
- update proguard · 2bed61aa
  HD authored 3 years ago
  
  2bed61aa
24 Feb, 2022 2 commits
- Merge remote-tracking branch 'origin/dev_sy' into master · c7b65248
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
```
  c7b65248
- 修改关怀版 · 34362e99
  sun authored 3 years ago
  
  34362e99
18 Feb, 2022 2 commits
- update docs · ebf0e3de
  HD authored 3 years ago
  
  ebf0e3de
- Merge remote-tracking branch 'origin/dev_sy' into master · dfb4beb5
  HD authored 3 years ago
  
  dfb4beb5
17 Feb, 2022 2 commits
- 修改我的页面中间部分的颜色 · 477219bb
  sun authored 3 years ago
  
  477219bb
- Merge remote-tracking branch 'origin/dev_sy' into master · e172e3a9
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
```
  e172e3a9
16 Feb, 2022 7 commits
- 修改蓝色版本一些没改到的地方 · 7b3ed7c3
  sun authored 3 years ago
  
  7b3ed7c3
- upgrade · 15d2bfa1
  HD authored 3 years ago
  
  15d2bfa1
- commit · 443cfe57
  HD authored 3 years ago
  
  443cfe57
- Merge remote-tracking branch 'origin/dev_sy' into dev_merge_all · 99966d34
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
```
  99966d34
- update proguard · 939eceee
  HD authored 3 years ago
  
  939eceee
- 添加一个关怀蓝色版本的sdk内容 · 2922e99f
  sun authored 3 years ago
  
  2922e99f
- 添加一个关怀蓝色版本的sdk内容 · ff68fa4e
  sun authored 3 years ago
  
  ff68fa4e
10 Feb, 2022 1 commit
- Merge remote-tracking branch 'origin/game_v19' into master · f580acf8
  HD authored 3 years ago
  
  f580acf8
27 Jan, 2022 1 commit
- update docx · 26d73c55
  HD authored 3 years ago
  
  26d73c55
20 Jan, 2022 3 commits

modify hotfix applymapping · 3fb38c08
HD authored 3 years ago

3fb38c08
Merge branch 'master' into game_v19 · abc09364
HD authored 3 years ago
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
abc09364

Merge remote-tracking branch 'origin/dev_huya' into master · 022b03dd

HD authored 3 years ago

# Conflicts:
#	GameSDK_API/build.gradle
#	GameSDK_API/proguard-rules.pro
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	GameSDK_Channels/GameSDK_Channel_Common_Base/src/main/java/com/dwg/sdk/common/channel/utils/SDKUtil.java
#	app/build.gradle
#	app/src/main/AndroidManifest.xml

022b03dd

19 Jan, 2022 1 commit
- add huya 4 · 6495e7e4
  HD authored 3 years ago
  
  6495e7e4
18 Jan, 2022 5 commits
- add huya 3 · 38666581
  HD authored 3 years ago
  
  38666581
- Merge branch 'master' into game_v19 · 9ad42298
  HD authored 3 years ago
  
  9ad42298
- Merge remote-tracking branch 'origin/master' into master · 4b9a847e
  HD authored 3 years ago
  
  4b9a847e
- modify report role bug from merge branch · 2cba0450
  HD authored 3 years ago
  
  2cba0450
- add huya 2 · 14c926e7
  HD authored 3 years ago
  
  14c926e7
17 Jan, 2022 3 commits
- modify gdt report money · d10c1b45
  HD authored 3 years ago
  
  d10c1b45
- Merge branch 'game_v19_tjfb_1' into game_v19 · 1dfdf0ae
  HD authored 3 years ago
  
  1dfdf0ae
- Merge branch 'dev_merge_all' into master · d97dee25
  HD authored 3 years ago
  
  d97dee25
15 Jan, 2022 7 commits
- Merge branch 'game_v19' into game_v19_tjfb_1 · 322d941b
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
```
  322d941b
- modify proguard · 7a5b4123
  HD authored 3 years ago
  
  7a5b4123
- reset gdt money · 99dfb08d
  HD authored 3 years ago
  
  99dfb08d
- modify tjfb patch · 4cf2da1c
  HD authored 3 years ago
  
  4cf2da1c
- add tjfb branch · f3bccdda
  HD authored 3 years ago
  
  f3bccdda
- merge huya · f797588e
  HD authored 3 years ago
  
  f797588e
- Merge remote-tracking branch 'origin/dev_huya' into dev_merge_all · a8202b85
  HD authored 3 years ago
```
# Conflicts:
#	GameSDK_API/build.gradle
#	GameSDK_API/proguard-rules.pro
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	GameSDK_Channels/GameSDK_Channel_Common_Base/src/main/java/com/dwg/sdk/common/channel/func/CommonParams.java
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	gradle.properties
```
  a8202b85