Commit Graph

102 Commits (be0252e09475241d8c9e8986dac320dc036c6f72)
 

Author SHA1 Message Date
zhangjiannan be0252e094 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-11-12 15:02:39 +08:00
zhangjiannan 4a5f2bf618 1 2024-11-12 15:02:29 +08:00
zhangjiannan ea4e546208 1 2024-11-09 14:01:17 +08:00
zhangjiannan e7d4d3be24 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-11-09 12:01:54 +08:00
zhangjiannan aaf08333db 1 2024-11-09 12:01:39 +08:00
miDuoMac d2d0a7e946 ios hotfix 2024-11-01 15:01:46 +08:00
miDuoMac 84fdd7c551 ios hotfix 2024-10-28 19:52:20 +08:00
miDuoMac dea3eb67e0 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	BuildABs/BuildABs
#	BuildABs/BuildABs.manifest
#	BuildABs/files.unity3d
#	BuildABs/files.unity3d.manifest
2024-10-28 18:15:33 +08:00
zhangjiannan 5fa130583e android hotfix 2024-11-05 11:54:20 +08:00
miDuoMac b45be91d4c ios hotfix 2024-10-28 17:50:24 +08:00
zhangjiannan 3f60cfb8b0 替换三个lua文件0.1版本特殊文件 2024-10-25 10:21:10 +08:00
zhangjiannan 8f9cb5ea49 差异同步 2024-10-24 16:58:36 +08:00
zhangjiannan 42af7901dc Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-23 14:07:23 +08:00
zhangjiannan 546fe93491 1 2024-10-23 14:07:16 +08:00
zhangjiannan 75fee1cd91 1 2024-10-22 16:49:27 +08:00
zhangjiannan 6019974c81 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-22 16:32:18 +08:00
zhangjiannan e9651e773e 1 2024-10-22 16:31:31 +08:00
zhangjiannan 4712e167c3 1 2024-10-21 20:26:13 +08:00
zhangjiannan 82c71d54b8 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-21 20:20:02 +08:00
zhangjiannan 401b032542 1 2024-10-21 20:19:54 +08:00
zhangjiannan 62017488d9 1 2024-10-21 19:25:57 +08:00
zhangjiannan 1ee10cb8ab android hotfix 2024-10-18 21:08:42 +08:00
zhangjiannan 4c42ad3f8e Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	BuildABs/BuildABs
#	BuildABs/BuildABs.manifest
#	BuildABs/files.unity3d
#	BuildABs/files.unity3d.manifest
2024-10-18 20:13:27 +08:00
zhangjiannan 1f319c4310 1 2024-10-18 20:08:40 +08:00
miDuoMac b46929c4c7 ios hotfix 2024-10-17 17:19:32 +08:00
miDuoMac aa1ad22632 ios hotfix 2024-10-17 16:15:04 +08:00
miDuoMac e0e954b959 iOS hotfix 2024-10-17 15:24:20 +08:00
miDuoMac 44b9265712 iOShotfix 2024-10-17 10:53:04 +08:00
miDuoMac dbfc0e3ab8 1 2024-10-16 18:49:23 +08:00
miDuoMac 706089fd04 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-16 18:34:00 +08:00
miDuoMac 64756899a2 1 2024-10-16 18:33:06 +08:00
zhangjiannan 12db1c90b8 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-16 18:17:47 +08:00
zhangjiannan cf8b2bb777 1 2024-10-16 18:16:57 +08:00
miDuoMac 4402667fdf ios bundle 2024-10-16 17:57:31 +08:00
miDuoMac c29011fc2e no message 2024-10-16 17:44:07 +08:00
miDuoMac bf3ce674ee no message 2024-10-16 17:37:41 +08:00
zhangjiannan 1b9533aa8d 同步差异文件 2024-10-28 05:00:03 +08:00
zhangjiannan 5c1c5cf335 添加subchannel 2024-10-28 03:50:58 +08:00
zhangjiannan e9041dbc07 1 2024-10-28 00:08:19 +08:00
zhangjiannan e8cf982492 1 2024-10-16 16:34:55 +08:00
zhangjiannan a37a3972f6 android hotfix 2024-10-16 16:27:29 +08:00
zhangjiannan ea8c49dca4 android bundle 2024-10-16 16:23:30 +08:00
zhangjiannan 5b93aa1e7f 服务器 2024-10-15 18:19:00 +08:00
DESKTOP-RH64908\Administrator 921064d8fd Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-15 16:24:42 +08:00
DESKTOP-RH64908\Administrator dc3b4468d6 1 2024-10-15 16:24:07 +08:00
zhangjiannan 9570cd8379 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	Assembly-CSharp-Editor-firstpass.csproj
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp-firstpass.csproj
#	Assembly-CSharp.csproj
#	ProjectSettings/ProjectSettings.asset
#	Unity.AssetBundleBrowser.Editor.Tests.csproj
#	Unity.AssetBundleBrowser.Editor.csproj
#	Unity.Postprocessing.Editor.csproj
#	Unity.Postprocessing.Runtime.csproj
#	spine-unity-editor.csproj
#	spine-unity.csproj
2024-10-15 16:18:10 +08:00
zhangjiannan 77f4923b2a 1 2024-10-15 16:16:50 +08:00
DESKTOP-RH64908\Administrator 8f1449b6c4 1 2024-10-15 16:01:25 +08:00
DESKTOP-RH64908\Administrator 8fcd9c1704 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-15 15:34:42 +08:00
DESKTOP-RH64908\Administrator 48e47a998f t 2024-10-15 15:34:26 +08:00