zhangjiannan
|
0c99ba5b3c
|
1
|
2025-01-08 13:35:14 +08:00 |
zhangjiannan
|
fc3a972e8f
|
1
|
2024-12-25 14:02:53 +08:00 |
zhangjiannan
|
dce176de85
|
1
|
2024-12-25 12:01:49 +08:00 |
zhangjiannan
|
c1b60d1531
|
1
|
2024-12-25 11:33:18 +08:00 |
zhangjiannan
|
d7b6cccf02
|
1
|
2024-12-19 15:56:32 +08:00 |
zhangjiannan
|
73d45e64ef
|
1
|
2024-12-09 17:52:30 +08:00 |
zhangjiannan
|
34c71f1cd2
|
1
|
2024-12-09 15:33:22 +08:00 |
zhangjiannan
|
391d63dbbc
|
1
|
2024-12-09 13:09:32 +08:00 |
zhangjiannan
|
c9528b474e
|
1
|
2024-11-30 22:45:52 +08:00 |
zhangjiannan
|
98e66ccb48
|
1
|
2024-12-02 16:12:37 +08:00 |
zhangjiannan
|
a62bfa6368
|
Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
# Assembly-CSharp.csproj
# Assets/LuaFramework/Scenes/Logo.unity
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2024-12-02 12:14:21 +08:00 |
zhangjiannan
|
024fd4dcd0
|
1
|
2024-12-02 12:13:04 +08:00 |
zhangjiannan
|
ee9353b4da
|
1
|
2024-11-27 13:15:09 +08:00 |
zhangjiannan
|
a0a1cf59c6
|
1
|
2024-11-26 19:24:07 +08:00 |
zhangjiannan
|
e77e3379f9
|
1
|
2024-11-26 19:18:33 +08:00 |
zhangjiannan
|
acdfe5dd33
|
切分之上传
|
2024-11-21 12:08:56 +08:00 |
PC-202302260912\Administrator
|
bec25fbce2
|
去掉英雄收集
|
2024-11-20 17:56:26 +08:00 |
zhangjiannan
|
4d5ebb7812
|
1
|
2024-11-25 20:58:46 +08:00 |
zhangjiannan
|
9a16ade326
|
社稷大典
|
2024-11-25 18:36:30 +08:00 |
zhangjiannan
|
c469f485f8
|
修改commonproto
|
2024-11-07 19:10:01 +08:00 |
DESKTOP-RH64908\Administrator
|
b6dff0ba59
|
替换commonproto
|
2024-11-07 11:48:54 +08:00 |
zhangjiannan
|
8d5d401aba
|
xianshangbug
|
2024-11-14 15:44:22 +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
|
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
|
e9651e773e
|
1
|
2024-10-22 16:31:31 +08:00 |
zhangjiannan
|
62017488d9
|
1
|
2024-10-21 19:25:57 +08:00 |
miDuoMac
|
dbfc0e3ab8
|
1
|
2024-10-16 18:49:23 +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
|
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
|
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
|
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 |
zhangjiannan
|
03279951a9
|
1
|
2024-10-09 11:55:01 +08:00 |
zhangjiannan
|
42946d541b
|
1
|
2024-10-09 11:45:47 +08:00 |
zhangjiannan
|
cd2bd84569
|
Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
# .gitignore
# Assembly-CSharp-Editor-firstpass.csproj
# Assembly-CSharp-Editor.csproj
# Assembly-CSharp-firstpass.csproj
# Assembly-CSharp.csproj
# Assets/LuaFramework/Scenes/Logo.unity
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# ThinkingAnalytics.csproj
# ThinkingSDK.csproj
# 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-09-18 10:58:24 +08:00 |
zhangjiannan
|
1606cd3433
|
1
|
2024-09-18 10:56:11 +08:00 |
DESKTOP-MMO982B\User
|
f36d578e0b
|
Revert "屏蔽"
This reverts commit 75fb8f2b94.
|
2024-09-14 13:25:38 +08:00 |
DESKTOP-MMO982B\User
|
75fb8f2b94
|
屏蔽
|
2024-09-12 23:03:50 +08:00 |
DESKTOP-MMO982B\User
|
5740292131
|
屏蔽大胸
|
2024-09-12 23:03:24 +08:00 |