Commit Graph

330 Commits (8a71d54f3a3eee87d7617f10eca6b6de6946bcd3)

Author SHA1 Message Date
zhangjiannan 47acde0ae0 1 2025-10-16 18:41:21 +08:00
zhangjiannan 12b7bebd5b Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
# Conflicts:
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_0035_s1.prefab.meta
2025-05-29 12:10:49 +08:00
zhangjiannan 1d86ce7795 1 2025-04-09 10:21:24 +08:00
zhangjiannan 787bef8f98 1 2025-04-01 00:19:12 +08:00
zhangjiannan 59a5ae3ec0 no message 2025-03-14 11:58:20 +08:00
zhangjiannan 8dbef5a6c7 1 2025-02-24 10:09:07 +08:00
zhangjiannan f3b3471a1e 1 2025-02-19 11:06:21 +08:00
zhangjiannan 3f55480143 1 2025-01-20 13:03:28 +08:00
zhangjiannan cadc61d380 1 2025-01-16 12:10:35 +08:00
zhangjiannan 4b9b01ebe8 1 2025-01-15 17:53:24 +08:00
zhangjiannan 2e99e0ebd4 1 2025-01-13 17:14:53 +08:00
zhangjiannan 38eff016b2 1 2024-12-31 20:25:27 +08:00
zhangjiannan 0dbf174870 1 2024-12-31 11:49:32 +08:00
zhangjiannan d9ab688cb4 1 2024-12-04 16:02:22 +08:00
zhangjiannan 5ccc7cbd25 1 2024-11-22 14:58:46 +08:00
zhangjiannan 912cad162d 1 2024-11-20 13:40:40 +08:00
zhangjiannan 4d576bc2dd 1 2024-11-12 16:59:52 +08:00
zhangjiannan 1a82ba62bb 战斗界面大使馆反的 2024-11-06 16:34:53 +08:00
zhangjiannan e4a90f4b94 修改prefab文本框字体 2024-11-05 15:02:33 +08:00
DESKTOP-MMO982B\User 55da43b09b 1 2024-11-01 14:48:39 +08:00
zhangjiannan ecf0d6bbab 1 2024-10-23 16:42:13 +08:00
DESKTOP-MMO982B\User fa6bddcb2e 本地化+适配 2024-10-10 14:52:20 +08:00
zhangjiannan 70aaa45680 1 2024-09-24 20:44:40 +08:00
zhangjiannan b10719a2fa 1 2024-09-24 20:25:20 +08:00
DESKTOP-MMO982B\User c6aaeb91f8 Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
# Conflicts:
#	Assets/ManagedResources/BG/LoadingBG.jpg.meta
#	Assets/ManagedResources/Fonts/HY-Sayeez.meta
#	Assets/ManagedResources/Fonts/HY-Sayeez/HY-Sayeez.otf.meta
2024-09-24 18:17:57 +08:00
zhangjiannan 80a13f5747 修改多语言 2024-09-19 18:08:27 +08:00
zhangjiannan 9d19dc2789 修改buildwindow多行 2024-09-02 12:15:34 +08:00
DESKTOP-MMO982B\User 66a1580380 本地化 2024-08-29 21:36:51 +08:00
zhangjiannan d42dde2bed 多语言工具bug修改 2024-08-26 17:18:31 +08:00
wangzhenxing ea00484141 去除thinking日志上报 cs文件
(cherry picked from commit 4422c72806)
2024-06-03 11:09:03 +08:00
PC-202302260912\Administrator 97f0b40841 战斗服同表提交 2024-04-20 19:14:27 +08:00
PC-202302260912\Administrator abaee2cefa 屏蔽战斗服配置文件提交 2023-07-05 18:56:44 +08:00
gaoxin 265c07a12d 【混淆】游戏内无用链接地址混淆 2022-02-24 21:24:33 +08:00
JLIOSM1 2714a8c8f6 【AB加密】修复游戏内无法加载files文件的问题,优化splashpanel的判断方式 2021-12-06 13:44:49 +08:00
zhangshanxue 6b506a2482 【AB加密】路径错误 2021-12-06 13:44:33 +08:00
zhangshanxue cfeedca679 【AB加密】Android不再进行加密 2021-12-06 13:44:26 +08:00
zhangshanxue 2d73b2d13a encrypt 2021-12-06 13:44:21 +08:00
gaoxin b6c01c82cf 【热更工具】cdn上没有时上传全部 2021-12-06 13:44:09 +08:00
gaoxin d154dc9248 【AB加密】解密方法提交 2021-12-06 13:43:57 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
wangzhenxing 1c7de24da1 [战斗]=======人物属性名称修改 2021-11-22 14:42:39 +08:00
wangzhenxing 9f374c1cd5 [战斗]========属性描述修改 2021-11-22 14:39:34 +08:00
gaoxin e077b70f02 【图片压缩】修改spine动画图片的压缩配置 2021-11-01 17:19:18 +08:00
gaoxin f9417e0746 【隐私协议】文字内容由代码控制 2021-10-27 17:03:47 +08:00
gaoxin 2b74430e61 【隐私协议】修改隐私协议的配置方式,查看协议的连接由GM协议配置的母包配置 2021-10-27 16:22:24 +08:00
gaoxin ab20dc943c 【用户隐私协议】内容完善 2021-10-25 13:53:44 +08:00
gaoxin b30a5e09eb 【用户隐私协议】添加到健康提示之后,热更之前 2021-10-21 10:21:03 +08:00
jiaoyangna a62e656d7b Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-29 15:49:39 +08:00
gaoxin eb452a1c69 【图片压缩工具】 2021-09-28 19:44:39 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00