Commit Graph

227 Commits (a797e80b39ee25ea31d038df3605042a8e6eaacc)

Author SHA1 Message Date
gaoxin 424b7547b9 【version工具】添加配置工具 2021-01-29 19:05:13 +08:00
gaoxin 9d58abfe35 【本地化】资源比较工具优化 2021-01-27 15:10:50 +08:00
zhangqiang 3028a31eb3 【ScrollFitterView】 修改 有 c# 代码 2021-01-27 12:08:09 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin ab0a82f981 【热更配置】应用到lua层 2021-01-26 10:38:48 +08:00
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
JieLing 95c0618c33 打包工具脚本提交 2020-09-10 11:47:18 +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
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
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 b53907dda2 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-07-23 11:10:19 +08:00
zhangqiang db4ffb1e95 提交 2020-07-23 11:08:11 +08:00
gaoxin 5c962f330a Merge branch '接入SDK' into master_test
# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset
2020-07-18 19:55:02 +08:00
gaoxin a1acdd13fb 支付接口接入,打点数据完善 2020-07-18 19:24:19 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
gaoxin 037290c657 sdk工程加入猕猴桃sdk 2020-07-15 17:53:40 +08:00
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
gaoxin 7605156317 sdk结构修改 2020-07-15 13:44:37 +08:00
gaoxin 465ca19e84 sdk相关文档提交 2020-07-10 09:59:56 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
gaoxin 64059c7808 导表工具优化,语言表路径修改 2020-07-07 09:48:38 +08:00
JieLing 5154fdbac0 外网0.16.14 内网0.15.25 2020-07-01 09:40:20 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing e3b6de5404 内网0.15.17 外网 0.16.8 2020-06-19 21:44:27 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing 7a410e1b60 内网测试 0.15.5 2020-06-19 16:18:05 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing ab3dbad074 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
JieLing 9a7de6479c 外网0.16.3 2020-06-03 19:01:14 +08:00
JieLing 6019de7c1e 外网0.16.2 2020-05-25 19:55:27 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 6b3a4b5fb9 切换为android平台 2020-05-15 17:46:08 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00