Commit Graph

247 Commits (883ec5a755b24fa8a66fc7cf265fbe9c9bdc705a)

Author SHA1 Message Date
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 59a5ae3ec0 no message 2025-03-14 11:58:20 +08:00
zhangjiannan 8dbef5a6c7 1 2025-02-24 10:09:07 +08:00
zhangjiannan 38eff016b2 1 2024-12-31 20:25:27 +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 4d576bc2dd 1 2024-11-12 16:59:52 +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
DESKTOP-MMO982B\User fa6bddcb2e 本地化+适配 2024-10-10 14:52:20 +08:00
zhangjiannan 70aaa45680 1 2024-09-24 20:44:40 +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
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
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
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
gaoxin e077b70f02 【图片压缩】修改spine动画图片的压缩配置 2021-11-01 17:19:18 +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
gaoxin a3bc278624 【配置】获取配置前,拉取更新 2021-09-18 12:02:16 +08:00
gaoxin 071e7db748 【配置】打包和同步校验服修改到配置文件工程中 2021-09-17 19:22:45 +08:00
gaoxin c17ea51996 【先遣配置】修改打包和战斗校验服分支配置 2021-09-17 16:10:01 +08:00
jiaoyangna d9c2f3451b 好感度第一次提交 2021-09-14 14:45:22 +08:00
zhangshanxue e4f65ba04b Merge branch 'china/test' into china/xq 2021-09-07 18:07:31 +08:00
gaoxin e04cb9cdb8 【热更新】修改热更新配置文件 2021-09-07 18:05:30 +08:00
zhangshanxue ddab583582 Merge branch 'china/dev' into china/xq 2021-09-06 11:02:57 +08:00
gaoxin 65dfb661ad 【version】修复设置version文件失败的问题 2021-09-06 11:02:11 +08:00
zhangshanxue 39fc099fe6 Merge branch 'china/dev' into china/xq
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-03 16:01:20 +08:00
gaoxin 7d8bb2bc36 【Version工具】修改配置文件走svn 2021-09-03 15:54:33 +08:00
gaoxin 104100ad01 【还原图片优化工具】 2021-09-03 09:49:30 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
gaoxin 672ca7db26 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:29:19 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
JLIOSM1 4756f15a93 【热更工具】优化IOS更新卡死的问题 2021-08-24 16:04:06 +08:00
gaoxin 090bd32b66 【Version】只显示配置文件 2021-08-16 16:50:48 +08:00
jiaoyangna f45b61adba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 10:55:15 +08:00
gaoxin 2d065b675c 【资源优化工具】ui贴图优化,修改为图片优化像素为2的N次方 2021-08-11 18:14:50 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
gaoxin 5dc039ab3a 【热更配置】跨服热更从test分支出 2021-08-04 22:14:59 +08:00
gaoxin 233df8ca23 【AB包】添加解密工具 2021-08-02 11:22:24 +08:00