Commit Graph

9256 Commits (1e203c822cfeb0157ac786bc20d5ca6f04bca74b)

Author SHA1 Message Date
ZhangBiao ef79b1d170 【界面优化】送神、归元、法宝 2021-10-28 09:47:24 +08:00
ZhangBiao 9ac870db81 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:34:12 +08:00
ZhangBiao 429366fa93 【三界降魔】调改 2021-10-27 18:26:51 +08:00
gaoxin 30ecb20689 【隐私协议】方法报错优化 2021-10-27 18:21:46 +08:00
ZhangBiao 55090ed8cc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-27 18:08:28 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
gaoxin f9417e0746 【隐私协议】文字内容由代码控制 2021-10-27 17:03:47 +08:00
gaoxin aabf86ba56 【山河社稷图】红点父节点错误 2021-10-27 16:36:56 +08:00
gaoxin 2b74430e61 【隐私协议】修改隐私协议的配置方式,查看协议的连接由GM协议配置的母包配置 2021-10-27 16:22:24 +08:00
gaoxin a1449fd504 【七界试炼】修复跨天红点不刷新的维妮塔 2021-10-27 15:14:47 +08:00
ZhangBiao 19a67875f8 【界面优化】大闹天宫部分 2021-10-27 13:45:05 +08:00
ZhangBiao 36f26dc0cb 【界面优化】抽到灵兽 2021-10-27 10:45:59 +08:00
ZhangBiao ac23ef4dbd 【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面 2021-10-27 10:37:29 +08:00
ZhangBiao f8a0a76d75 【界面优化】灵兽技能、英雄传说 2021-10-27 09:54:42 +08:00
gaoxin 266d3088e7 【战斗】修复假战斗报错 2021-10-26 21:43:00 +08:00
ZhangBiao 2f8ad786f5 【界面优化】HelpPopup 2021-10-26 18:30:32 +08:00
ZhangBiao 490f566b4d 【界面优化】技能 2021-10-26 18:23:32 +08:00
ZhangBiao 779cb4d99e 【界面优化】技能 2021-10-26 18:18:36 +08:00
wangzhenxing a38fe30800 [主角技能]=====注重主角立绘等级显示修改 2021-10-26 18:03:02 +08:00
ZhangBiao d5cf1c5395 【界面优化】归元、技能 2021-10-26 17:55:49 +08:00
ZhangBiao 353a9774c5 【界面优化】定位、恭送 2021-10-26 17:36:08 +08:00
ZhangBiao e29dd36c26 【界面优化】法宝界面 2021-10-26 16:33:20 +08:00
jiaoyangna bdff69b0e2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 15:29:04 +08:00
jiaoyangna 41966a1487 逍遥游报错修改提交 2021-10-26 15:28:44 +08:00
wangzhenxing c48a16bb6c [主角技能]=====技能升级界面预设修改提交 2021-10-26 15:17:17 +08:00
gaoxin e7da10a595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:45:34 +08:00
gaoxin a692f8d9d4 【本场最佳】主角名颜色根据修行等级改变 2021-10-26 14:45:28 +08:00
jiaoyangna b6475fb1b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:17:56 +08:00
jiaoyangna 3d832f81cf 【ID1010556】
【优化】好感度解锁等级优化
2021-10-26 14:17:07 +08:00
gaoxin 9a2e2581f9 【资源】名称重复修改 2021-11-10 05:30:59 +08:00
gaoxin bef3a23392 【资源】名称重复修改 2021-11-10 05:28:10 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
wangzhenxing 4c292035cf [主角技能]======心魔试炼快速战斗不显示主角伤害记录修改 2021-10-26 14:00:23 +08:00
ZhangBiao ccd2b2ffd7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 10:13:41 +08:00
ZhangBiao cce7591927 【山河社稷图】小关卡单独上阵报错修改 2021-10-26 10:13:28 +08:00
gaoxin 7ac3b1bc14 【飘渺之旅】修复完成全部任务,无法领取的问题 2021-10-25 19:22:57 +08:00
ZhangBiao f51c80b277 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 18:40:33 +08:00
ZhangBiao 7332c761b8 【御剑行】错别字 2021-10-25 18:40:22 +08:00
gaoxin 8fdb8942e1 【飘渺之旅】修复第一天显示了重复的任务的问题 2021-10-25 18:15:48 +08:00
liujiaqi 59c1629b18 【资源】四不像icon 2021-11-07 17:32:11 +08:00
wangzhenxing fbf66138ca [玉虚论道]======玉虚段位奖励界面特效层级修改提交 2021-10-25 17:19:01 +08:00
ZhangBiao 9c76f42161 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 16:47:15 +08:00
ZhangBiao e8f0a9b4a1 【御剑行】界面黑屏倒计时结束后弹出排行榜 2021-10-25 16:46:51 +08:00
wangzhenxing 7b406e1c4b 【战斗】===========主角技能使用 队伍战斗力 接口修改 2021-10-25 16:37:41 +08:00
gaoxin 04a1196586 【战斗力】一旦战斗力改变就让后端重新计算战斗力 2021-10-25 16:13:48 +08:00
wangzhenxing 237767eb29 【战斗】=============灵兽技能 8 回合cd判断修改 2021-10-25 15:54:38 +08:00
gaoxin 102c24cd8e 【至尊降世】文字遮挡优化 2021-10-25 14:53:32 +08:00
gaoxin ab20dc943c 【用户隐私协议】内容完善 2021-10-25 13:53:44 +08:00
wangzhenxing 09755c8d12 [战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力 2021-10-25 13:48:48 +08:00
ZhangBiao 0cef23209c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 11:54:13 +08:00
ZhangBiao 7871064069 【修为】Tips修改 2021-10-25 11:54:04 +08:00
wangzhenxing 7ae770a3b0 [战斗]=============伤害力公式修改 防御 乘2 2021-10-25 11:48:54 +08:00
ZhangBiao abd9795933 【百宝商会】红点提交 2021-10-25 11:15:27 +08:00
ZhangBiao b267ad30c6 【百宝商会】取消QA 2021-10-25 10:47:12 +08:00
wangzhenxing b7a2cee564 玉虚战斗记录敌方分数显示修改 2021-10-22 18:37:42 +08:00
wangzhenxing d51a4292f3 协议提交 主角技能图标显示修改 玉虚战斗记录敌方分数修改 2021-10-22 18:30:09 +08:00
ZhangBiao 60e71f5e42 【御剑行】哎,提交 2021-10-22 18:20:08 +08:00
ZhangBiao 929de39da9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 18:16:05 +08:00
ZhangBiao cc2cfd7a21 【百宝商会、御剑行】按钮一致性提交、显示修改 2021-10-22 18:15:55 +08:00
jiaoyangna 00ae40d23a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 18:07:09 +08:00
jiaoyangna 7ed825b4c1 飘渺之旅修改提交 2021-10-22 18:06:44 +08:00
ZhangBiao de2ce6919c 【御剑行】提交 2021-10-22 17:58:07 +08:00
ZhangBiao 0d8c381ace Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:45:56 +08:00
ZhangBiao 2bb589b5dd 【御剑行】竞猜界面点击任意位置关闭修改 2021-10-22 17:45:46 +08:00
wangzhenxing 5e541238de [战斗]=============128 129 130 131 修改 添加最大限制 2021-10-22 17:34:15 +08:00
jiaoyangna fa36828e1c Revert "至尊降世活动结束不关闭提交"
This reverts commit 031895a9d1.
2021-10-22 17:28:09 +08:00
jiaoyangna 031895a9d1 至尊降世活动结束不关闭提交 2021-10-22 17:24:41 +08:00
jiaoyangna f7db9fc907 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:22:18 +08:00
jiaoyangna 73b9fad19d 至尊降世活动兼容提交 2021-10-22 17:21:31 +08:00
ZhangBiao e821387c93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 16:47:39 +08:00
gaoxin c1352e0a59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 02:52:56 +08:00
gaoxin 24ea182587 【最佳】加入主角伤害展示 2021-11-10 02:52:51 +08:00
gaoxin 3f2ce26aff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:17:33 +08:00
gaoxin 99985c442d 【积天豪礼】红点加入主界面下拉按钮红点 2021-11-10 01:17:28 +08:00
gaoxin 8d8a50a0ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:01:09 +08:00
gaoxin c080345afc 【积天豪礼】主界面按钮资源上传 2021-11-10 01:01:05 +08:00
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00
gaoxin 8125b21af3 【跨服】修复七界试炼红点刷新不及时的问题 2021-11-10 00:56:37 +08:00
ZhangBiao 0508d1d652 【御剑行】跨期修改 2021-10-22 16:47:30 +08:00
ZhangBiao ac6dca4805 【御剑行】赛季结束不可打开竞猜 2021-10-22 15:46:35 +08:00
ZhangBiao 0f0c0586bf 【御剑行】红点 2021-10-22 15:44:19 +08:00
ZhangBiao c16004cf3b 【百宝商会】增加次数显示 2021-10-22 15:41:49 +08:00
ZhangBiao 26e980b503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:49:08 +08:00
ZhangBiao 0d94f23e41 【御剑行】红点提交 2021-10-22 14:48:56 +08:00
wangzhenxing 7ad105855a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:44:40 +08:00
wangzhenxing 8590face13 【战斗】========主角技能名称图片资源提交 2021-10-22 14:44:11 +08:00
ZhangBiao befea57bbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:29:09 +08:00
ZhangBiao 7da9ee8b6d 【弹窗优化】邮件、每日任务 2021-10-22 14:28:59 +08:00
ZhangBiao 5aba21341c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:22:23 +08:00
ZhangBiao 1f5f4f15c3 【弹窗优化】提交 2021-10-22 14:22:12 +08:00
wangzhenxing fc3edefd82 【战斗】=====hot buff修改提交 2021-10-22 14:11:25 +08:00
wangzhenxing 8035e3f6f3 [战斗]==============战斗消息位置修改 2021-10-22 14:04:15 +08:00
wangzhenxing eefaa33687 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:59:08 +08:00
wangzhenxing e0b7df4206 [战斗]==========被动199 历战之躯 被动修改 2 2021-10-22 13:57:51 +08:00
ZhangBiao 609b191785 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:53:22 +08:00
ZhangBiao 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
wangzhenxing 2a6f3389b3 [战斗]=============被动199 历战之躯 修改 2021-10-22 13:35:44 +08:00
ZhangBiao cdc17b555e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:22:51 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
wangzhenxing d93e0a9c4e 角色技能升级按钮添加动效 2021-10-22 13:15:08 +08:00
wangzhenxing 73361ef6c9 玉虚奖励预设修改提交 2021-10-22 12:09:10 +08:00
gaoxin 7b486f1559 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-23 03:01:26 +08:00
gaoxin 25a14f7a79 【商店】免费次数的商店,取消刷新后今日不再显示满次红点的功能,满次后刷新红点显示添加 2021-10-23 03:01:20 +08:00
gaoxin 582ab51299 【山河社稷图】每日奖励文字修改 2021-10-22 21:25:49 +08:00
wangzhenxing 4518c8c175 修行技能bug修改提交 2021-10-22 11:56:46 +08:00
ZhangBiao 7b20915c6c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:27:58 +08:00
ZhangBiao 39aa09f317 【点击黑色区域关闭】 2021-10-22 11:27:47 +08:00
ZhangBiao e48606b648 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:21:53 +08:00
ZhangBiao 1215e46af8 【御剑行】点击商店返回后增加请求 2021-10-22 11:21:42 +08:00
jiaoyangna bfd2e06ecc 至尊降世修改提交 2021-10-22 11:20:24 +08:00
ZhangBiao abbcc52f01 【御剑行】提交 2021-10-22 10:57:01 +08:00
ZhangBiao fa818dac35 【御剑行】提交 2021-10-22 10:41:20 +08:00
ZhangBiao 9fd8d6d886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:25:36 +08:00
ZhangBiao a732dadb5f 【御剑行】修改提交 2021-10-22 10:25:20 +08:00
wangzhenxing eb5867b31c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:21:36 +08:00
wangzhenxing c494145ff8 主角技能添加屏蔽 2021-10-22 10:21:07 +08:00
ZhangBiao 19d4f27f76 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:20:42 +08:00
ZhangBiao 85819fcbae 【御剑行】红点调整 2021-10-22 10:20:30 +08:00
wangzhenxing ae47df29bb 【红点】=============修行技能红点提交 2021-10-22 10:08:53 +08:00
ZhangBiao 747cb5b179 【御剑行】修改提交 2021-10-22 10:00:19 +08:00
ZhangBiao d8da0bb26a 【协议】补提 2021-10-22 09:33:54 +08:00
ZhangBiao cef99194af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 09:26:20 +08:00
ZhangBiao 2ab4be658d 【主角修为】图标顺序调整 2021-10-22 09:26:09 +08:00
jiaoyangna 68cbb5905a 至尊降世修改提交 2021-10-21 18:58:36 +08:00
jiaoyangna 4e89351ef8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:12:41 +08:00
jiaoyangna b24061ccd0 至尊降世报错修改提交 2021-10-21 18:12:28 +08:00
gaoxin 6c9f0098cf 【逍遥游】修复加速状态下,转盘卡死问题 2021-10-21 18:02:33 +08:00
jiaoyangna ad84124cd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:00:20 +08:00
jiaoyangna bdb8510d92 坐骑界面修改提交 2021-10-21 18:00:05 +08:00
ZhangBiao 9e0ca64dbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:55:20 +08:00
ZhangBiao e3b9c82ac7 【七界试炼】左右按钮在调整 2021-10-21 17:55:11 +08:00
wangzhenxing fb7ad25c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:49:46 +08:00
wangzhenxing 05669fe98b 红点常量提交 2021-10-21 17:49:30 +08:00
wangzhenxing 7261a428fb 主角技能伤害提交 2021-10-21 17:47:49 +08:00
ZhangBiao 869b65dd95 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
2021-10-21 17:47:34 +08:00
ZhangBiao 96860e358c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:46:34 +08:00
ZhangBiao 42618596e1 【七界试炼】按钮显隐提交 2021-10-21 17:46:23 +08:00
jiaoyangna 36b574a645 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:39:09 +08:00
jiaoyangna 8fa8a9d690 至尊降世界面修改提交 2021-10-21 17:38:53 +08:00
ZhangBiao a6ebd138e4 【新百宝商会】提交 2021-10-21 17:28:53 +08:00
gaoxin 6cb068ea60 【建木神树】红点刷新不及时 2021-10-21 17:18:40 +08:00
gaoxin 34a58a310c 【排行榜】修复膜拜后页签红点刷新不及时,修复跨服前七天跨服按钮会显示红点 2021-10-21 17:02:05 +08:00
gaoxin f4912f5772 【逍遥游】转盘再加速 2021-10-21 16:43:19 +08:00
gaoxin aa9ce7f992 【逍遥游】优化转盘速度 2021-10-21 16:30:38 +08:00
wangzhenxing 5575ba2245 [战斗]=====灵兽技能修改提交 2021-10-21 16:17:10 +08:00
wangzhenxing c131aa96b4 [qijie]button 2021-10-21 16:12:59 +08:00
ZhangBiao bf82ae5d9e 【七界试炼】按钮调整2
(cherry picked from commit da71c81536)
2021-10-21 15:16:28 +08:00
ZhangBiao da71c81536 【七界试炼】按钮调整2 2021-10-21 15:15:55 +08:00
ZhangBiao 24f0574e0a 【七界试炼】按钮修改
(cherry picked from commit 81fe590710)
2021-10-21 15:15:24 +08:00
ZhangBiao 81fe590710 【七界试炼】按钮修改 2021-10-21 15:12:01 +08:00