Commit Graph

774 Commits (4477c38a2514c86e4848cff09f04679be422b385)

Author SHA1 Message Date
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 481c818ffa Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:43:30 +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
jiaoyangna 0b157b6ee8 轩辕宝镜入口替换 2020-08-14 16:09:00 +08:00
wangzhenxing e139a43f65 屏蔽金翅大鹏不死效果 2020-08-14 16:50:32 +09:00
jiaoyangna 4604df2d0b 修改轩辕副本立绘 2020-08-14 14:36:24 +08:00
jiaoyangna 40b9550c54 修改轩辕副本立绘提交 2020-08-14 14:35:48 +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
ZhangBiao 7a1e1599d8 2020-08-14 10:14:53 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
JieLing acf9a73068 重复引用资源修改 2020-08-13 19:40:50 +08: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 b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +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
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
jiaoyangna d5c241208d merge 2020-08-12 14:25:36 +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
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +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
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +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
jiaoyangna 16e1699e65 no message 2020-08-11 11:58:41 +08:00
jiaoyangna 179632ca21 no message 2020-08-11 11:56:03 +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
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
zhangqiang 7749211534 合成修改 2020-08-08 19:27:10 +08:00
zhangqiang 32c788b8ac 神将合成代码 2020-08-08 18:18:26 +08:00
zhangqiang 17b6db91e2 英雄合成提交部分代码 2020-08-08 15:51:55 +08:00
zhangqiang 6dd95ec834 神将合成部分显示代码 2020-08-08 11:06:01 +08:00
gaoxin a35b26a215 修改平分概率类型的技能的概率计算方式 2020-08-07 17:35:16 +08:00
zhangqiang f2d743a343 英雄合成预设更新 2020-08-07 14:23:05 +08:00
gaoxin 723531298d 删除被动194额外附加伤害也会触发效果的并导致报错的问题, 2020-08-07 10:57:30 +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 416cfbde79 技能释放后摇时间添加0.2 2020-08-06 18:01:59 +09: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
ZhangBiao 3522da8a3a 森罗去除遮罩 2020-08-06 15:05:33 +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
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
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
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
gaoxin 195a48d3fe 副本添加最大战斗力判断 2020-08-05 16:26:45 +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
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 f548b53b46 开引导 在森罗杀进程 重新登陆后 不回到森罗 2020-08-04 18:19:20 +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
zhangqiang 0a8bdc5765 援助 十绝阵 合成 提示性bug 2020-08-04 14:02:28 +08:00
jiaoyangna 9a53f20f60 小游戏提交 2020-08-04 10:39:16 +08:00
gaoxin 04e6c2fb42 删除不必要的符号 2020-08-03 21:23:16 +08:00
gaoxin 01b6b4e1fd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 21:08:43 +08:00
gaoxin b257aa2eef dragview回滚 2020-08-03 21:08:38 +08:00
ZhangBiao f6b827c922 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 20:02:10 +08:00
ZhangBiao c2024a15cb bug修复 2020-08-03 20:01:59 +08:00
zhangqiang 13cad0dd5b 排行榜切磋玩回来立绘丢了问题修改 2020-08-03 19:41:54 +08:00
jiaoyangna 6c6f28f634 fix bug 2020-08-03 18:40:20 +08:00
jiaoyangna 3ff95a1796 fix bug 2020-08-03 17:23:28 +08:00
jiaoyangna ffdb4c9666 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 17:07:35 +08:00
jiaoyangna 3c6043d32c destroy guildmaincitypanel close playerheadview 2020-08-03 17:07:24 +08:00
ZhangBiao ab93491cfe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 16:59:50 +08:00
ZhangBiao 9b28e7c140 森罗bug修改 2020-08-03 16:59:37 +08:00
zhangqiang 72dd128c1f 添加星级天赋描述叠加 去掉无用打印 2020-08-03 16:49:44 +08:00
ZhangBiao a9f8f39280 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 16:11:21 +08:00
ZhangBiao 0cd5ffca9d 魂印特效关闭 2020-08-03 16:11:04 +08:00
jiaoyangna 54aae5181f fix bug 2020-08-03 15:51:48 +08:00
gaoxin 70cd06da2b 计算战斗力卡顿的问题优化 2020-08-03 15:36:29 +08:00
ZhangBiao 880b52763f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 15:20:39 +08:00
ZhangBiao 434aaeccff 魂印特效 无用log删除 2020-08-03 15:20:18 +08:00
jiaoyangna 5f20e3e100 fixed bug 2020-08-03 13:37:21 +08:00
ZhangBiao 971245b8cc 充值恢复 2020-08-03 10:39:26 +08:00
jiaoyangna 01e5a62715 #115003 UnityLogError
E:/Git/JL/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua:373: table index is nil ,
UnityEngine.Application.CallLogCallback(String, String, LogType, Boolean)   公会红包红点的问题
2020-08-03 10:36:45 +08:00
jiaoyangna 89dbd09856 resolve hero tails update 2020-08-03 10:32:20 +08:00
jiaoyangna 4ab47f9a01 resolve hero commit 2020-08-03 10:31:43 +08:00
jiaoyangna 8b3bcecb59 activity commit 2020-08-03 10:18:04 +08:00
gaoxin 0a19c1dd82 优化红点检测机制为分帧刷新,优化人物升级红点检测 2020-08-01 13:15:27 +08:00
gaoxin 054c04c465 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-01 11:17:49 +08:00
gaoxin 6bfebc928f 战斗日志打印文件名修改,战斗数据optiondata变为userdata 2020-08-01 11:16:33 +08:00
zhangqiang b6de5d609a 排行切磋完出来 排行榜为空 修复 2020-08-19 04:47:37 +08:00
jiaoyangna 7a0848100a resolve hero tails update 2020-07-31 18:36:54 +08:00
jiaoyangna cc7a9bda0c resolve hero commit 2020-07-31 18:25:19 +08:00
gaoxin 4c93923b39 尝试修复编队和角色装备界面报错的问题 2020-07-31 18:24:13 +08:00
gaoxin a4bcead414 无用log删除 2020-07-31 18:04:11 +08:00
zhangqiang 93c1913a73 适配修改 2020-08-19 03:31:43 +08:00
skuld 3f5fdf3ec1 修改大闹天宫BOSS名字 2020-07-31 16:42:35 +08:00
zhangqiang fc7552f55f 车迟抢夺玩家人物头像属性修改 四元阵修改预设文字 2020-08-19 02:25:01 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00