Commit Graph

69 Commits (2d76e09900338c75e85f5a81c2af24cfeb117fe0)

Author SHA1 Message Date
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
PC-202302260912\Administrator 97f0b40841 战斗服同表提交 2024-04-20 19:14:27 +08:00
PC-202302260912\Administrator abaee2cefa 屏蔽战斗服配置文件提交 2023-07-05 18:56:44 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
gaoxin 071e7db748 【配置】打包和同步校验服修改到配置文件工程中 2021-09-17 19:22:45 +08:00
gaoxin c17ea51996 【先遣配置】修改打包和战斗校验服分支配置 2021-09-17 16:10:01 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
jiaoyangna 4d8bf852d4 Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
2021-07-19 14:10:11 +08:00
jiaoyangna 01b3f79c43 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40 2021-07-19 14:09:40 +08:00
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
zhangqiang c87576944f 【刷资源提交】 2021-07-03 17:02:18 +08:00
wangzhenxing 6ad90cf3cf [战斗]==========伤害文字修改提交 2021-07-03 15:50:58 +08:00
gaoxin 8085adfe25 【工具】同步战斗校验服,添加未进版本的文件 2021-06-28 10:27:08 +08:00
gaoxin da16945d78 【工具】同步战斗校验服代码添加,提交需svn命令行工具
https://www.visualsvn.com/files/Apache-Subversion-1.14.1.zip
2021-06-26 19:52:08 +08:00
wangzhenxing 51392f0a62 服务器战斗逻辑同表工具修改 2021-05-17 10:21:23 +08:00
gaoxin fff810429e 【工具】战斗数据表同步工具添加 2021-04-30 14:37:01 +08:00
jiaoyangna 0999af8061 资源提交 2021-04-22 15:07:18 +08:00
gaoxin 2b93da57a5 【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题 2021-03-29 10:47:39 +08:00
gaoxin 639602c6ac 【导表工具】关闭老工具显示 2021-02-26 14:39:34 +08:00
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
zhangqiang 96ab48c22f 遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-27 16:14:42 +08:00
zhangqiang bd6fdce461 遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-27 16:12:21 +08:00
JieLing 95c0618c33 打包工具脚本提交 2020-09-10 11:47:18 +08:00
zhangqiang b725617a8d 公会副本提交 2020-08-21 15:52:49 +08:00
zhangqiang c08c537b16 公会副本提交 2020-08-20 20:05:38 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
jl_ios 21ea44a475 导表工具完善 2020-08-15 16:42:55 +08:00
gaoxin fcda2d9d1d 导表工具添加 2020-08-15 15:09:27 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
altair aff5c002a9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/CombatControl.xlsx
2020-07-27 21:04:51 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
zhangqiang 3fa23c25ea 修改界面id 2020-07-23 21:29:40 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
zhangqiang 9bb7008a6d 淘汰赛战斗 可以观看多场记录 2020-07-23 12:19:45 +08:00
zhangqiang db4ffb1e95 提交 2020-07-23 11:08:11 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
gaoxin 64059c7808 导表工具优化,语言表路径修改 2020-07-07 09:48:38 +08:00