Commit Graph

6950 Commits (f1a7e93595ae0ff39644495298ae9d42d7c4239b)

Author SHA1 Message Date
ZhangBiao fc8e199a43 【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破 2021-07-08 18:41:14 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
zhangqiang 21ec904da5 【心魔试炼】点击快速战斗偶先报错卡死 2021-07-08 18:08:16 +08:00
zhangqiang c723fa04af 【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字 2021-07-08 16:20:22 +08:00
ZhangBiao e250223aa2 【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
2021-07-08 15:55:04 +08:00
wangzhenxing f247221fcc 【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能) 2021-07-07 20:29:37 +08:00
zhangqiang 9c2dee5856 【缥缈之旅】没解锁天数完成了任务,礼包显示灰点 2021-07-07 15:56:29 +08:00
zhangqiang 803fcee6bf 【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误 2021-07-07 15:16:31 +08:00
wangzhenxing dad8dbf11b [公会红包]=============红包抢完显示白片修改 2021-07-07 15:09:06 +08:00
jiaoyangna df4a9b0d74 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-07 11:57:49 +08:00
jiaoyangna 2042f3ace8 Merge branch '0优化/主题活动' into china/dev 2021-07-07 11:57:31 +08:00
jiaoyangna c72ccc962b 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-07 11:53:23 +08:00
jiaoyangna 8ec0256d78 排序修改提交 2021-07-07 11:44:40 +08:00
zhangqiang 5163eab963 【缥缈之旅】停在活动界面等待活动结束,没有自动退出,继续操作活动内的按钮,弹服务器紧急维护 2021-07-07 11:40:30 +08:00
jiaoyangna fd9f4248b6 百宝商会文字错乱修改 2021-07-07 11:30:21 +08:00
jiaoyangna 7aa590621c 百宝商会文字错乱修改 2021-07-07 11:28:50 +08:00
jiaoyangna 05ef24c89c 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-06 19:01:27 +08:00
jiaoyangna 735f694270 隐藏页签 2021-07-06 17:04:36 +08:00
zhangqiang 22e00b9fcd 【心魔试炼】增加快速挑战功能 2021-07-06 16:50:48 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
jiaoyangna 6cc47ddac1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:50:41 +08:00
jiaoyangna bc185698d3 颜色修改提交 2021-07-06 15:50:32 +08:00
gaoxin 8297176603 Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-07-06 15:37:43 +08:00
gaoxin 441952c2fb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:27:44 +08:00
gaoxin 9c58070aa8 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
#	Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
#	Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
2021-07-06 15:27:09 +08:00
jiaoyangna 1cd1e719b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-06 15:26:06 +08:00
jiaoyangna 337ad7b1d2 颜色修改提交 2021-07-06 15:26:02 +08:00
jiaoyangna bc34bdce69 【ID1009609】
【优化】无尽副本优化
2021-07-06 15:19:56 +08:00
zhangqiang c66cd98958 【化虚坛】神将合成材料框没有隐藏bug 2021-07-06 14:53:15 +08:00
jiaoyangna 3219a1a2b8 【ID1009609】
【优化】无尽副本优化
2021-07-06 14:43:45 +08:00
jiaoyangna d55789480a 图片修改提交 2021-07-06 14:43:12 +08:00
jiaoyangna 8dfb6ac056 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:41:01 +08:00
jiaoyangna cd8e1554de 图片提交 2021-07-06 11:22:53 +08:00
jiaoyangna 4ba69227f5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 11:17:49 +08:00
zhangqiang d29613e32a 【缥缈之旅】替换资源 2021-07-06 10:22:17 +08:00
jiaoyangna b36edb9ae9 资源导入工具修改提交 2021-07-05 18:52:37 +08:00
zhangqiang d25b80dd1b 【缥缈之旅】bug 2021-07-05 18:01:31 +08:00
jiaoyangna f63f411268 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 17:19:25 +08:00
jiaoyangna bd030bedbc 神将来源 新人商城 描述修改 2021-07-05 17:18:49 +08:00
jiaoyangna c6963b337c 添加音频导入工具 2021-07-05 16:43:19 +08:00
jiaoyangna 570db27b9f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 16:32:56 +08:00
jiaoyangna bc4d6fb744 资源导入工具修改提交
(cherry picked from commit e587f6d35d7b4b592e1785c1aa9bc27c190a0e0e)
2021-07-05 16:32:40 +08:00
ZhangBiao 241f780a15 【心愿抽卡】概率显示修改 2021-07-05 16:31:13 +08:00
zhangqiang 632291a19c 【法宝归元】鸿蒙阵上的英雄归元法宝弹 null and 【灵兽山】长按升级弹服务器开小差 2021-07-05 15:34:42 +08:00
jiaoyangna b7447f8d0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 15:18:07 +08:00
jiaoyangna 39cf4372c5 心愿 up修改 2021-07-05 15:18:03 +08:00
ZhangBiao 729a016a45 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 15:13:46 +08:00
ZhangBiao 84b4277e44 【礼盒、特惠神装】bug修改 2021-07-05 15:13:37 +08:00
zhangqiang 73a4eee31b 【缥缈之旅】提交8 2021-07-05 15:04:46 +08:00
ZhangBiao 56d0cce1e4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 13:47:36 +08:00
ZhangBiao 673f8c24d5 【礼盒、神装】刷新 2021-07-05 13:47:27 +08:00
zhangqiang 8ba8c98345 【魂印穿戴】无尽副本注释魂印绑定英雄 2021-07-05 12:09:20 +08:00
jiaoyangna 1fedb95da6 主题活动 心愿招募 描述修改 2021-07-05 11:37:29 +08:00
jiaoyangna 0e7d7d6c93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 11:29:48 +08:00
jiaoyangna c038859400 【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
2021-07-05 11:29:05 +08:00
ZhangBiao c2384f1fbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 11:28:28 +08:00
ZhangBiao 5173faa482 【主界面】右侧伸缩条 2021-07-05 11:28:18 +08:00
zhangqiang ac7ab00c7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 10:58:59 +08:00
zhangqiang a938b217a1 【缥缈之旅】提交7 2021-07-05 10:58:41 +08:00
ZhangBiao 48e3b63a08 【特惠神装】界面逻辑修改 2021-07-05 10:57:47 +08:00
jiaoyangna 9fa4e26f7e 仙缘汇聚箱修改提交 2021-07-05 09:55:02 +08:00
zhangqiang b519d3270c 【缥缈之旅】提交6 2021-07-03 20:02:13 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
wangzhenxing fd3b2c0ed6 [战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交 2021-07-03 18:52:28 +08:00
wangzhenxing 7d9edd42dd [ui]==============心魔试炼适配修改提交 2021-07-03 18:28:18 +08:00
wangzhenxing 7d91331f5f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-03 17:47:25 +08:00
wangzhenxing bc5d3e2f45 [战斗]============减怒数字修改提交 2021-07-03 17:47:00 +08:00
zhangqiang 6d5d480543 【缥缈之旅】提交4 2021-07-03 17:46:44 +08:00
wangzhenxing c082a3c3d6 【功能】===========心魔试炼预设修改 2021-07-03 17:24:46 +08:00
zhangqiang c87576944f 【刷资源提交】 2021-07-03 17:02:18 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 6af4522342 【缥缈之旅】提交3 2021-07-03 16:49:13 +08:00
wangzhenxing 6ad90cf3cf [战斗]==========伤害文字修改提交 2021-07-03 15:50:58 +08:00
gaoxin 5458cd2889 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-03 15:27:09 +08:00
gaoxin f75b844961 【拍脸】修复偶现栈空报错 2021-07-03 15:26:58 +08:00
wangzhenxing 353a15c216 [战斗]======战斗图片文字设置修改提交 2021-07-03 15:11:13 +08:00
wangzhenxing 2fbd5dd5e9 [战斗]============战斗伤害图片字修改提交 2021-07-03 14:50:03 +08:00
wangzhenxing c266827b4e [战斗]==========战斗文字材质球修改 2021-07-03 14:29:35 +08:00
wangzhenxing 802f41cadd Merge branch 'china/dev-c-battle' into china/dev 2021-07-03 14:18:37 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
wangzhenxing 48e2a8a9bd [战斗]========伤害数量图片修改提交 2021-07-02 20:48:36 +08:00
wangzhenxing 94dde31cf9 [战斗]====中毒伤害图片字提交 2021-07-02 19:12:09 +08:00
ZhangBiao bcfb63e451 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 16:27:46 +08:00
ZhangBiao 3d462c708f 【站内信】排序 2021-07-02 16:27:36 +08:00
jiaoyangna 71a0806828 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 16:24:56 +08:00
jiaoyangna cf412831e2 buildconfig 脚本提交 2021-07-02 16:24:50 +08:00
ZhangBiao 0a403e2099 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 16:11:04 +08:00
ZhangBiao ee1da4348c 【站内信】协议漏题 2021-07-02 16:10:47 +08:00
jiaoyangna 6da6d47bcc 商店界面特效修改提交 2021-07-02 15:52:30 +08:00
jiaoyangna eed42686ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:50:45 +08:00
jiaoyangna d49f3c8e54 Revert "每日商店特效删除"
This reverts commit 64382c68c3.
2021-07-02 14:50:31 +08:00
wangzhenxing 338ab55daa 【战斗】=========新增336被动 2021-07-02 14:49:28 +08:00
ZhangBiao 21f8259143 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:48:41 +08:00
ZhangBiao 01a6f7f277 【抽卡概率】增加显示概率 2021-07-02 14:48:29 +08:00
jiaoyangna 26fc32d583 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:28:57 +08:00
jiaoyangna 64382c68c3 每日商店特效删除 2021-07-02 14:28:46 +08:00
zhangqiang 211dc5838f 【特惠神装拍脸】修改 2021-07-02 14:22:42 +08:00
ZhangBiao f2dd26a329 【特惠神装】icon调整 2021-07-02 13:50:56 +08:00
jiaoyangna 11bb11fb4b 每日礼包banner 替换 2021-07-02 13:50:41 +08:00
jiaoyangna 0fc62c0dfa 来源图片修改提交 2021-07-02 13:47:04 +08:00