Commit Graph

1012 Commits (7f0d404e5d983d51098e13a6c19ceb4c580294a3)

Author SHA1 Message Date
jiaoyangna 3834e1960e 图片导入 2020-08-14 14:17:38 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
jiaoyangna 905d77b0c6 Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 13:01:17 +08:00
jiaoyangna c9c3cb2fa4 operatingmanager commit 2020-08-14 13:01:12 +08:00
jiaoyangna 4c8d556b31 动态立绘提交 2020-08-14 12:59:19 +08:00
jiaoyangna b4acffd954 动态立绘提交 2020-08-14 12:20:29 +08:00
ZhangBiao 7a1e1599d8 2020-08-14 10:14:53 +08:00
JieLing be59c59230 部分大图资源整理 2020-08-14 10:02:24 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
JieLing acf9a73068 重复引用资源修改 2020-08-13 19:40:50 +08:00
JieLing 700f396a6b 资源加密添加,防止使用工具获得资源 2020-08-13 19:30:16 +08:00
wangzhenxing 9dce11a6eb 测试战斗修改提交 2020-08-13 17:36:20 +09:00
ZhangBiao e655562a71 2020-08-13 17:07:05 +08:00
ZhangBiao 9bac8e2bfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 16:38:57 +08:00
ZhangBiao e397fa88e7 2020-08-13 16:38:40 +08:00
wangzhenxing 442877d3e0 珍奇宝阁预设代码提交 2020-08-13 16:38:20 +09:00
jiaoyangna fbf7c3b41d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:44:53 +08:00
jiaoyangna 7de60dea2b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:51 +08:00
ZhangBiao a180f63fe7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:46 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
gongjiawei c18cb5fc01 音频更新 2020-08-13 14:23:37 +08:00
ZhangBiao d1ec3fa196 每周 每月礼包阴影问题修复 2020-08-13 13:33:48 +08:00
ZhangBiao 2fe27c64ec 2020-08-13 12:33:21 +08:00
ZhangBiao a6d69bd001 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 12:00:38 +08:00
ZhangBiao f4dad25b7a 神将置换bug修复 2020-08-13 12:00:18 +08:00
gaoxin de27163861 合成修改 2020-08-13 11:46:55 +08:00
gaoxin b4eef8c285 神将合成显示修改 2020-08-13 11:11:26 +08:00
gaoxin 48d8f3887b 修改神将合成显示问题 2020-08-13 10:28:16 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
gongjiawei 0d0ae17a68 音频更新 2020-08-12 18:11:39 +08:00
gongjiawei a5663aae42 音频更新 2020-08-12 17:53:48 +08:00
ZhangBiao 0931365a3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 17:03:49 +08:00
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
gongjiawei b4e8c6803c 音频更新 2020-08-12 16:02:35 +08:00
gaoxin 809e10df79 Merge branch 'master_develop2' into master_develop 2020-08-12 14:45:01 +08:00
jiaoyangna 8c27eecbf6 xuanyuan update 2020-08-12 14:30:55 +08:00
jiaoyangna d5c241208d merge 2020-08-12 14:25:36 +08:00
gaoxin 4e639d2401 Merge branch 'master_develop2' into master_develop 2020-08-12 14:22:29 +08:00
jiaoyangna 95dff6f0e9 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-08-12 14:20:45 +08:00
jiaoyangna 96d47d34a8 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
2020-08-12 14:17:01 +08:00
ZhangBiao 06bc9c1f1d Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-12 14:15:27 +08:00
jiaoyangna 7bee1280b3 xuanyuan update 2020-08-12 14:13:28 +08:00
ZhangBiao ed319be87e 神将置换 2020-08-12 14:13:16 +08:00
jiaoyangna e372c84cdb xuanyuan 2020-08-12 13:34:07 +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
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
gongjiawei 8133bd8e62 音频更新 2020-08-12 11:18:44 +08:00
gongjiawei 572f6c156b 音频更新 2020-08-12 11:12:10 +08:00
wangzhenxing 6d274b7991 【ID1008763】
【技能】124 释放技能后回复己方后排[a]点怒气 (目标不正确,给双方后排加怒)
2020-08-12 10:24:02 +09:00
ZhangBiao c1c013a007 神将置换 基本功能完成 2020-08-11 20:55:05 +08:00
gongjiawei 45fd69256e 音频更新 2020-08-11 18:38:02 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
gongjiawei 2b5a37e8d9 音频更新 2020-08-11 16:14:09 +08:00
jiaoyangna 9f186311b3 xuanyuan 2020-08-11 15:11:33 +08:00
jiaoyangna cea8d854f9 no message 2020-08-11 14:28:15 +08:00
jiaoyangna f7fe1d9513 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	data_execl/base_data/GlobalActivity.xlsx
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
2020-08-11 14:07:10 +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 16e1699e65 no message 2020-08-11 11:58:41 +08:00
jiaoyangna 179632ca21 no message 2020-08-11 11:56:03 +08:00
gongjiawei 4c5b87d922 音频更新 2020-08-11 11:29:20 +08:00
jiaoyangna 6f05841519 no message 2020-08-11 11:00:30 +08:00
wangzhenxing 109bcc49f6 张强对魂印增加属性修改 2020-08-11 11:24:22 +09:00
jiaoyangna dc058f99e1 no message 2020-08-11 10:13:50 +08:00
jiaoyangna 3d2f288934 轩辕宝镜提交 2020-08-11 09:48:21 +08:00
gongjiawei e56c19f1bc 音频更新 2020-08-10 17:32:01 +08:00
gongjiawei 6cbffb4abb 音频更新 2020-08-10 16:51:12 +08:00
zhangqiang 176f9d4c47 合成bug 2020-08-10 16:17:13 +08:00
wangzhenxing 7953575074 角色身上如果有无敌盾不会扣出怒气 2020-08-10 15:50:28 +09:00
zhangqiang 22ad34291b 献祭 和 吞卡 掉落身上装备不显示提交 2020-08-10 14:16:48 +08:00
zhangqiang a417e88b0b 恭送编队不检测大门闹天宫 and 车迟斗法失败刷新顺序修改 2020-08-10 11:30:27 +08:00
zhangqiang cca8355c33 神将合成提交 2020-08-10 11:28:25 +08:00
zhangqiang 3937426101 神将合成提交 2020-08-10 10:56:17 +08:00
gongjiawei 9307a48960 音频更新 2020-08-10 10:47:21 +08:00
zhangqiang 7749211534 合成修改 2020-08-08 19:27:10 +08:00
zhangqiang 32c788b8ac 神将合成代码 2020-08-08 18:18:26 +08:00
gongjiawei fddd5748cf 音频更新 2020-08-08 17:01:19 +08:00
zhangqiang 17b6db91e2 英雄合成提交部分代码 2020-08-08 15:51:55 +08:00
zhangqiang 6dd95ec834 神将合成部分显示代码 2020-08-08 11:06:01 +08:00
gaoxin bab0c056eb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-07 17:35:23 +08:00
gaoxin a35b26a215 修改平分概率类型的技能的概率计算方式 2020-08-07 17:35:16 +08:00
gongjiawei fe738c1dea 音频更新 2020-08-07 17:33:40 +08:00
jiaoyangna 63f1dcb2c9 convertutf8..cs 提交 2020-08-07 15:19:25 +08:00
zhangqiang f2d743a343 英雄合成预设更新 2020-08-07 14:23:05 +08:00
gaoxin 723531298d 删除被动194额外附加伤害也会触发效果的并导致报错的问题, 2020-08-07 10:57:30 +08:00
ZhangBiao f09a0448bc 2020-08-07 10:34:18 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
jiaoyangna 16d4b6477d no message 2020-08-06 17:37:07 +08:00
jiaoyangna 22b02b5cca encoding convert 2020-08-06 17:35:07 +08:00
wangzhenxing e4cf5b8fd1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 18:02:20 +09:00
jiaoyangna 67f07c8214 代码转utf8格式 2020-08-06 17:59:23 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna 41cf013543 convert format 2020-08-06 17:45:30 +08:00
jiaoyangna 8d2576e185 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 17:37:48 +08:00
jiaoyangna 5c13a25bb5 encoding convert 2020-08-06 17:37:42 +08:00
wangzhenxing 416cfbde79 技能释放后摇时间添加0.2 2020-08-06 18:01:59 +09:00
gongjiawei 8a5d729f71 音频更新 2020-08-06 16:12:55 +08:00
ZhangBiao a125fe5840 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 15:05:50 +08:00
ZhangBiao 3522da8a3a 森罗去除遮罩 2020-08-06 15:05:33 +08:00
skuld 2eebab650e 替换 万象境图片 2020-08-06 10:57:17 +08:00
ZhangBiao ed373d1851 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-06 10:43:28 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 3bb0906865 法宝归元中文表 2020-08-06 10:38:55 +08:00
gaoxin fee7d18688 森罗幻境,修复非快速战斗怪物点不删除的问题 2020-08-05 22:47:21 +08:00
Genkins 3f1eb6db0f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 21:20:22 +08:00
Genkins 7dd6f75e24 删除Spine UI对象时,释放模型资源 2020-08-05 21:20:13 +08:00
ZhangBiao 54783bef35 森罗快速点击服务器报错问题修复 2020-08-05 21:12:50 +08:00
jiaoyangna c095459166 no message 2020-08-05 21:01:20 +08:00
ZhangBiao 456ab0aa92 森罗 进图后2.5秒才能开始移动,避免服务器小差 2020-08-05 19:32:36 +08:00
ZhangBiao eeaa1f26f8 2020-08-05 19:18:15 +08:00
zhangqiang 0a37b3cb11 法宝回归协议提交 2020-08-07 12:41:35 +08:00
gongjiawei 6c4dab9fbb 音頻跟新 2020-08-05 18:15:19 +08:00
lihaiyang a6f1259075 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-05 18:06:28 +08:00
ZhangBiao 879331e416 森罗炸弹数量刷新,奖励和generalpanel界面适配 2020-08-05 18:02:47 +08:00
ZhangBiao a1b9ca69f6 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-05 17:16:30 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao d72d87d497 2020-08-05 17:16:06 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
gaoxin 195a48d3fe 副本添加最大战斗力判断 2020-08-05 16:26:45 +08:00
gongjiawei ee6133f289 音频更新 2020-08-05 16:08:07 +08:00
jiaoyangna 7d5efc523e 图鉴修改提交 2020-08-05 16:04:06 +08:00
jiaoyangna 0a26260692 删除红点 2020-08-05 15:49:44 +08:00
jiaoyangna 220577bd0d 图鉴修改 2020-08-05 15:43:40 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
jiaoyangna c5bced9968 副本修改提交 2020-08-05 15:00:56 +08:00
ZhangBiao 6f0c40707e 置换界面 2020-08-05 14:10:46 +08:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
gongjiawei 0c1250f88c 音频更新 2020-08-05 11:43:13 +08:00
zhangqiang 54148395b4 日常副本判断开启临时添加战力计算 2020-08-07 06:06:55 +08:00
jiaoyangna dd4800f657 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 20:49:48 +08:00
jiaoyangna 1b7f35e41f bg update 2020-08-04 20:49:42 +08:00
ZhangBiao 989703a0e4 乾坤宝盒单抽bug修复、四元阵赠送“元神玉” 2020-08-04 20:30:26 +08:00
ZhangBiao 6acaa8549d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 20:23:16 +08:00
ZhangBiao ee28c18254 森罗bug修复 2020-08-04 20:22:56 +08:00
jiaoyangna 802286d743 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:41:22 +08:00
jiaoyangna e9438df1b7 图鉴优化 2020-08-04 18:41:17 +08:00
zhangqiang e45e6c9325 公会技能升级优化 2020-08-04 18:37:30 +08:00
ZhangBiao 7255baef99 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:19:38 +08:00
ZhangBiao f548b53b46 开引导 在森罗杀进程 重新登陆后 不回到森罗 2020-08-04 18:19:20 +08:00
gongjiawei 4c0c01cefe 音频更新 2020-08-04 17:47:38 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
ZhangBiao ade7ee88bc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 16:19:06 +08:00
ZhangBiao 24381aba57 森罗bug修复 2020-08-04 16:18:48 +08:00
zhangqiang e11b5fd7bb 寻宝红点修改 添加解锁新章节音效 2020-08-04 15:33:44 +08:00