Commit Graph

119 Commits (ed9808c4f1cd615f4784b6c0e768b685f80053fc)

Author SHA1 Message Date
xiaoyi ed9808c4f1 Merge branch 'master' into release/v3.4.0
# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapTap/Achievement/CHANGELOG.md
#	Assets/TapTap/Achievement/package.json
#	Assets/TapTap/Bootstrap/CHANGELOG.md
#	Assets/TapTap/Bootstrap/package.json
#	Assets/TapTap/Common/CHANGELOG.md
#	Assets/TapTap/Common/package.json
#	Assets/TapTap/Friends/package.json
#	Assets/TapTap/License/CHANGELOG.md
#	Assets/TapTap/License/package.json
#	Assets/TapTap/Login/CHANGELOG.md
#	Assets/TapTap/Login/package.json
#	Assets/TapTap/Moment/CHANGELOG.md
#	Assets/TapTap/Moment/package.json
#	Assets/TapTap/Support/package.json
#	Assets/TapTap/TapDB/CHANGELOG.md
#	Assets/TapTap/TapDB/VERSIONNOTE.md
#	Assets/TapTap/TapDB/package.json
#	IngameDebugConsole.Runtime.csproj
#	TapSDK2-Unity.sln
#	TapTap.Achievement.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	pushhub.sh
2021-11-09 14:44:57 +08:00
xiaoyi 1328ebcc8e feat: update compile result 2021-11-09 13:56:22 +08:00
xiaoyi 5fdcd64d13 feat: update rangemode limit 2021-11-09 11:31:33 +08:00
xiaoyi 4899e0c84b feat: update db binary , update package version 2021-10-25 17:11:04 +08:00
oneRain fb9df093bc chore 2021-10-22 17:32:22 +08:00
oneRain 92b03cedb8 fix: code strip 2021-10-15 18:16:31 +08:00
xiaoyi de8cbbaff5 feat: update doc and config 2021-10-15 13:56:08 +08:00
xiaoyi ec25e6e821 Merge branch 'feat/friend-v3' into release/v3.3.0
# Conflicts:
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp.csproj
#	Assets/TapTap/Achievement/Plugins/TapTap.Achievement.dll
#	Assets/TapTap/Achievement/Plugins/TapTap.Achievement.pdb
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.pdb
#	Assets/TapTap/License/Plugins/TapTap.License.dll
#	Assets/TapTap/License/Plugins/TapTap.License.pdb
#	Assets/TapTap/Login/Plugins/TapTap.Login.dll
#	Assets/TapTap/Login/Plugins/TapTap.Login.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.dll
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.pdb
#	ProjectSettings/EditorBuildSettings.asset
#	TapSDK/TapSDK.sln
#	TapSDK2-Unity.sln
#	TapTap.Achievement.Editor.csproj
#	TapTap.Common.Editor.csproj
#	TapTap.Login.Editor.csproj
#	TapTap.Moment.Editor.csproj
#	TapTap.TapDB.Editor.csproj
#	compile.sh
2021-10-15 12:12:47 +08:00
oneRain 12f5081c17 feat: friends 2021-10-14 10:45:17 +08:00
xiaoyi 8ee486349c feat: add support fun in common 2021-09-27 10:33:25 +08:00
xiaoyi f18bc8c100 feat: add taptap login permission 2021-09-06 11:00:42 +08:00
xiaoyi 471a4cccb3 feat: update gh draft message 2021-09-01 12:00:32 +08:00
xiaoyi de8419d74e feat: update native binary 2021-09-01 11:55:07 +08:00
肖熠 9233edb971 Update README.md 2021-08-31 14:50:05 +08:00
xiaoyi ac598cbd0c feat: update package.json , update native binary , update doc 2021-08-31 11:45:31 +08:00
xiaoyi 53d6d9de00 feat: update dll 、update readme 2021-08-31 11:05:57 +08:00
xiaoyi 7eb4f6340c feat : mv tapconfig to common , add common init 2021-08-26 16:51:22 +08:00
xiaoyi 32e9baf5f3 doc: update doc 2021-08-23 11:24:24 +08:00
xiaoyi 5afe083f3e fix: fix host error 2021-08-09 16:13:37 +08:00
xiaoyi ec11b96b11 feat: switch rnd env 2021-08-04 11:12:15 +08:00
xiaoyi 768d12cd85 feat:add taptap login in PC platform , add compile maxosx unity demo 2021-07-29 14:11:49 +08:00
xiaoyi 3efc679efe feat: update doc , update unitypackage compile script , update push upm script 2021-07-27 17:50:47 +08:00
xiaoyi 6a2c5a64ba feat: update dll version , update compile script 2021-07-27 15:52:47 +08:00
xiaoyi 6758e3fa22 feat: update achievement interface , update doc , add achievementStats field 2021-07-27 15:15:37 +08:00
xiaoyi 9bc4d3ae3d feat: update achievement model , update package version 2021-07-27 12:04:01 +08:00
xiaoyi c286ddefa3 doc: update achievement doc 2021-07-26 15:26:01 +08:00
xiaoyi 465199cb51 Merge branch 'feat/friendship' into release/v3.1.0
# Conflicts:
#	.gitignore
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	TapSDK/TapBootstrapSDK/TapBootstrapSDK.sln
#	TapSDK2-Unity.sln.DotSettings.user
2021-07-26 13:21:37 +08:00
xiaoyi 58012dd732 opt: update bootstrap proj folder 2021-07-26 12:29:00 +08:00
oneRain c22f265f7b feat: friendship 2021-07-23 18:18:17 +08:00
xiaoyi 515fea8798 feat: update ios binary 2021-07-21 19:28:38 +08:00
xiaoyi 5fb7005b71 feat: update binary 2021-07-21 18:07:24 +08:00
xiaoyi 3103af222a feat: update binary 2021-07-21 17:21:26 +08:00
xiaoyi 952d6f74c0 feat: update achievement binary , update tds user get func 2021-07-21 16:45:56 +08:00
xiaoyi f10d14e7ae feat: update bootstrap 2021-07-20 19:21:49 +08:00
xiaoyi 041ff22463 feat: update tdsuser properties 2021-07-20 19:11:00 +08:00
xiaoyi 6e1484cd5f fix: fix db framework add error 2021-07-20 13:34:25 +08:00
xiaoyi 558efac6bd feat: update csproj、update achievement 2021-07-19 15:12:33 +08:00
xiaoyi 1cd0d03ef2 doc: update readme 2021-07-17 11:30:13 +08:00
xiaoyi 8f2eed880e feat: update readme 2021-07-17 10:37:46 +08:00
xiaoyi 16cb286cdd feat: update lc storage verison 2021-07-16 14:13:39 +08:00
xiaoyi 9e593b9758 feat: update 3.0 native binary 2021-07-16 12:00:43 +08:00
xiaoyi 461cdabf4a Merge branch 'feat/tdsuser' of git.gametaptap.com:tds/client-sdk/tds-sdk-all/tapsdk2/tapsdk2-unity into feat/tdsuser 2021-07-15 14:24:24 +08:00
xiaoyi 8e10faf9a1 feat: login scene add testqualification case 2021-07-15 14:24:11 +08:00
于振宇 f8bc5c8343 doc: TDSUser 2021-07-15 06:04:16 +00:00
xiaoyi 2f804358fa feat: update Bootstrap and Login changeLog 2021-07-15 13:51:32 +08:00
xiaoyi f6fa8f25cf feat:update ref location 2021-07-15 12:03:30 +08:00
xiaoyi d4a1db007e feat: update package.json and dll version 2021-07-15 11:54:54 +08:00
xiaoyi c87e88b91d Merge branch 'develop/2.x' into feat/tdsuser
# Conflicts:
#	Assets/LCLibs/Common.dll.meta
#	Assets/LCLibs/TapBootstrap_2.1.7.aar
#	Assets/LCLibs/TapBootstrap_2.1.7.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/Android/libs/TapBootstrap_2.1.6.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/Headers/TapBootstrap.h
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/TapBootstrapSDK
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_2.1.7.aar.meta
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.pdb
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.dll
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.pdb
#	Assets/TapTap/License/Plugins/TapTap.License.dll
#	Assets/TapTap/License/Plugins/TapTap.License.pdb
#	Assets/TapTap/Login/Editor/TapLoginIOSProcessor.cs
#	Assets/TapTap/Login/Plugins/TapTap.Login.dll
#	Assets/TapTap/Login/Plugins/TapTap.Login.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.dll
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.pdb
#	TapSDK2-Unity.sln
2021-07-15 11:49:07 +08:00
xiaoyi f39e4d30a2 feat: update dll 2021-07-12 10:39:25 +08:00
xiaoyi 42548190be feat(*): Bootstrap remove unuse interface , remove native library , iOS compilation script migration to login 2021-07-06 15:53:36 +08:00