Commit Graph

84 Commits (aed62d755a48e6378e08ba6c32abb15066abc15f)

Author SHA1 Message Date
gaoxin bd6e61d92a 【语言工具】添加代码语言还原工具 2020-11-07 15:42:11 +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
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
wangxiaolong 484089cd75 添加异步资源加载日志说明 2020-09-18 14:29:50 +08:00
JieLing 95c0618c33 打包工具脚本提交 2020-09-10 11:47:18 +08:00
gaoxin f9350d662f 分辨率小于1080*1920的背景统一放大1.2倍 2020-09-05 20:05:50 +08:00
zhangqiang 96e795c7c5 全屏界面 背景图片适配脚本 自行挂载 2020-09-05 14:22:53 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
gaoxin a0535ffc12 lujit添加对64位代码的支持 2020-08-29 15:11:01 +08:00
gaoxin e6c8e81c82 修复小游戏反复打开会报错的问题 2020-08-27 23:01:07 +08:00
JieLing e0ab42e9c5 删除对files.unity3d的解密处理 2020-08-25 09:44:17 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
jiaoyangna ccb38eb3a7 qinglong commit 2020-08-24 20:10:52 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +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
JieLing 66687a1ce4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:49:33 +08:00
jiaoyangna 84f82d488d live2d commit 2020-08-14 17:43:24 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing 5e9448dd24 资源提交, 2020-08-14 17:35:18 +08:00
jiaoyangna 4c8d556b31 动态立绘提交 2020-08-14 12:59:19 +08:00
JieLing 700f396a6b 资源加密添加,防止使用工具获得资源 2020-08-13 19:30:16 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
jl_ios 8be4e2745b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 12:43:03 +08:00
jl_ios 14645cb184 iOS 打包修复无法生成luabytes文件的问题 2020-08-12 11:58:12 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
jl_ios ab6be0a9e2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-11 14:05:49 +08:00
jl_ios 02b7e07d20 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +08:00
jiaoyangna 63f1dcb2c9 convertutf8..cs 提交 2020-08-07 15:19:25 +08:00
jiaoyangna 67f07c8214 代码转utf8格式 2020-08-06 17:59:23 +08:00
Genkins 88fd5161f8 提交优化工具 2020-07-29 15:15:30 +08:00
Genkins 98ce0d920e 提交优化工具 2020-07-29 15:06:59 +08:00
Genkins 7649e67049 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 17:58:39 +08:00
Genkins 65252cb36d 添加图片优化工具 2020-07-28 17:57:02 +08:00
gaoxin fbff3d2a2a 删除音频文件导入时自动设置文件格式的问题 2020-07-28 17:20:25 +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
JieLing 64ff767121 Merge branch '接入SDK' into master_develop 2020-07-27 17:53:54 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
gaoxin 2b7eb6bf2a Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
#	Assets/Effect/Prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
2020-07-25 16:13:55 +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