Commit Graph

8145 Commits (043f174f08d67d3b1050d83f596fc299c08f5934)

Author SHA1 Message Date
jiaoyangna f1bcffd06f 红点修改提交 2022-03-29 16:31:20 +08:00
jiaoyangna 701938ad27 【ID1011391】
飞升鸿蒙阵等级限制调整

(cherry picked from commit 0f69eb822293597556fe825a6b9f99d27b8d8f91)
2022-03-29 16:25:49 +08:00
wangzhenxing 9f2b6a80b5 [功能]=======命石显示修改 2022-03-29 15:49:54 +08:00
wangzhenxing 57812ad22f [功能]=======命石修改,建木神树修改 2022-03-29 15:28:56 +08:00
jiaoyangna bbde58e666 【ID1011387】
战力冲刺有奖励可领取时增加红点提示

(cherry picked from commit d2773bab9e7c632f68f26b3829eb495296654761)
2022-03-29 14:03:42 +08:00
wangzhenxing 24475514b9 【bug】======命石属性描述修改 2022-03-29 13:39:05 +08:00
wangzhenxing 3e9ed638b4 [bug]=====命石描述修改,车迟开启提示修改 2022-03-29 11:54:41 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
wangzhenxing 91ace072a2 [功能]=====车迟斗法开服7日后开启 2022-03-28 15:29:10 +08:00
wangzhenxing c593cdf2d6 [bug]======寻宝特效穿透修改 2022-03-25 14:12:19 +08:00
jiaoyangna c66ce27a88 主城特效修改提交 2022-03-22 15:43:16 +08:00
wangzhenxing eceb6abcdc [探索]=========屏蔽功能入口 2022-03-22 14:01:59 +08:00
jiaoyangna 40630efdb4 山河试炼倒计时修改提交 2022-03-22 13:45:34 +08:00
jiaoyangna 54faa0a971 山河试炼活动报错修改 2022-03-22 13:38:59 +08:00
jiaoyangna 2c9e94dcc9 牛气冲天任务修改提交 2022-03-22 11:57:50 +08:00
jiaoyangna 5348a49256 Revert "冲突提交"
This reverts commit b5a29c9152.
2022-03-22 11:06:54 +08:00
jiaoyangna 1ab08284a4 牛气冲天任务状态修改提交 2022-03-22 11:06:03 +08:00
jiaoyangna c93b9e3f04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 18:29:21 +08:00
jiaoyangna b5a29c9152 冲突提交 2022-03-21 18:29:03 +08:00
wangzhenxing e936ce29ce [战斗]======选择英雄添加新判断 2022-03-21 18:23:54 +08:00
wangzhenxing 4562629709 [功能]==============修行技能添加战斗力提交 2022-03-21 17:46:30 +08:00
jiaoyangna b57a82309b 山河试炼修改提交 2022-03-21 17:21:11 +08:00
jiaoyangna 31afc70951 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 11:04:38 +08:00
jiaoyangna 096845f8ad 【ID1011356】
山河试炼添加引导
2022-03-21 11:04:08 +08:00
wangzhenxing 3529402f5e [战斗]=========被动431修改 2022-03-21 10:22:12 +08:00
wangzhenxing 3e5b67ddf6 【技能】=========149 150 修改提交 2022-03-18 16:29:03 +08:00
wangzhenxing 9e010245fe [战斗]========技能149 被动429 430 431修改提交 2022-03-18 15:47:16 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
wangzhenxing 01b3a8c35b 【战斗】=======护盾效果表现修改 2022-03-17 16:50:40 +08:00
wangzhenxing 0f2eebfe42 [战斗]===================被动433修改 技能添加148 2022-03-17 16:15:34 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
wangzhenxing a82de03880 [战斗]=======被动431 -434修改提交 2022-03-17 10:12:35 +08:00
gaoxin 61ce0ea1bc 【四灵试炼】修复选择四灵中佩戴唯一性的魂印的助战神将,会导致自己无法佩戴的问题 2022-03-15 18:23:52 +08:00
gaoxin 81f76cc4dc 【限时折扣】主界面按钮资源修改添加特效 2022-03-15 13:37:13 +08:00
wangzhenxing 008b3671c4 [战斗]======buff提示文字修改 2022-03-14 17:10:15 +08:00
wangzhenxing eff4c32f68 [战斗]========被动431修改 2022-03-14 14:06:12 +08:00
gaoxin e97ab8fa84 【跳转】锻器阁页签顺序修改导致判断错误 2022-03-11 17:34:15 +08:00
gaoxin 52bdc56af4 【锻器阁】调整魂印和宝物的顺序 2022-03-11 16:57:04 +08:00
gaoxin d48d420dd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-11 16:36:58 +08:00
gaoxin de178b9875 【锻器阁】未解锁的功能显示未解锁提示 2022-03-11 16:36:47 +08:00
wangzhenxing 8e05053512 【战斗】=========被动429 430 431添加提交 2022-03-11 16:30:38 +08:00
jiaoyangna 81ca63fc7e 车迟积分修改提交 2022-03-10 18:20:35 +08:00
jiaoyangna 1e39c04f7d 车迟结算界面积分修改提交 2022-03-10 18:17:44 +08:00
jiaoyangna 18e5994279 车迟斗法提交 2022-03-10 18:08:45 +08:00
jiaoyangna 5be4e726ea 挂机收益显示错误修改 2022-03-10 17:04:37 +08:00
jiaoyangna 9de941b911 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-10 13:45:32 +08:00
jiaoyangna e5dde41cda 【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整
2022-03-10 13:45:12 +08:00
张彪 2ea7d31c8b 【张彪】交接文档 2022-03-09 17:01:10 +08:00
张彪 b120f5ccd5 【主城】修改右侧条状态 2022-03-08 14:05:24 +08:00
jiaoyangna 0b42597919 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 17:28:00 +08:00
jiaoyangna 0c8af1e9b5 天地洪炉修改提交 2022-03-07 17:27:42 +08:00
张彪 3ffdee3acb 【战力冲刺】提交 2022-03-07 16:10:46 +08:00
张彪 22514fe5f7 【战力冲刺】调整 2022-03-07 16:05:38 +08:00
张彪 98443bbdb2 Revert "【战力冲刺】领取功能调整"
This reverts commit 5a5bc3237b.
2022-03-07 14:30:31 +08:00
张彪 5f7cb1b4df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 13:18:21 +08:00
张彪 5a5bc3237b 【战力冲刺】领取功能调整 2022-03-07 13:18:14 +08:00
jiaoyangna bc01045eae 山河试炼奖励显示错误修改 2022-03-07 10:21:56 +08:00
jiaoyangna d6a67e89f2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-07 10:13:08 +08:00
jiaoyangna a2fd8dcaea 山河试炼奖励显示错误修改提交 2022-03-07 10:12:51 +08:00
gaoxin 1d3ef22dac 【玩家信息】兼容以前 2022-03-04 18:26:36 +08:00
gaoxin 51b829874d 【角色信息】所有跨服查看信息的不再可以添加好友和黑名单,修复跨服信息显示错误 2022-03-04 18:13:16 +08:00
gaoxin b10ebcd3ba 【车迟斗法】抢夺界面添加跨服显示 2022-03-04 17:48:27 +08:00
gaoxin 8768ee20a2 【牛气冲天】活动界面牛详细信息展示属性 2022-03-04 17:29:09 +08:00
wangzhenxing 586b77af34 [战斗]======被动427修改提交 2022-03-04 16:25:34 +08:00
张彪 1e5ac04921 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-03 17:37:40 +08:00
张彪 d62388966b 【车迟斗法】抢夺记录玩家信息 2022-03-03 17:37:34 +08:00
wangzhenxing 361c08b5b1 [战斗]======被动428修改 2022-03-03 17:08:01 +08:00
wangzhenxing ba38abcdaf 【战斗】=========被动428提交 2022-03-03 16:56:33 +08:00
张彪 4d97370a24 【车迟斗法】跨服 2022-03-03 16:52:08 +08:00
张彪 f0f205ca9e 【车迟斗法提交】 2022-03-03 15:14:42 +08:00
张彪 0b75ce4df4 【车迟斗法】提交 2022-03-03 14:39:24 +08:00
wangzhenxing 45661cf346 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-03 13:39:41 +08:00
wangzhenxing e9f73fb70e 【战斗】======被动427提交 2022-03-03 13:36:32 +08:00
张彪 5a416c5149 【车迟斗法】工会界面倒计时 2022-03-03 13:30:25 +08:00
jiaoyangna 5dc08c93ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:33:01 +08:00
jiaoyangna babc4d671b 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 18:32:34 +08:00
张彪 dfe2c0ca66 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:26:28 +08:00
张彪 5a43fbdda0 【易经宝库】提交 2022-03-02 18:26:20 +08:00
jiaoyangna a01a70e9bb 红点提交 2022-03-02 18:09:49 +08:00
jiaoyangna 3b0871ad17 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 18:08:56 +08:00
张彪 b4232a2e46 【易经宝库】大奖删除兼容 2022-03-02 17:50:12 +08:00
jiaoyangna 6b4cf31c3c 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 17:48:52 +08:00
张彪 336e3b68fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 16:10:13 +08:00
张彪 62d9d6da20 【易经宝库】最终大奖显示特效 2022-03-02 16:10:06 +08:00
jiaoyangna cd220c0f35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 15:06:30 +08:00
jiaoyangna 5fcee7571c 【ID1011199】
超值返利图标位置调整
2022-03-02 15:06:13 +08:00
张彪 684ed7ea0d 【装备】跳转到指定位置 2022-03-02 15:02:23 +08:00
张彪 40d2fc4659 【装备】跳转摘星阁 2022-03-02 14:40:13 +08:00
张彪 ef47e3dfb7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 14:15:20 +08:00
张彪 d33dcb9f97 【装备】装备添加快捷入口到摘星阁 2022-03-02 14:15:13 +08:00
wangzhenxing a27d510730 【被动】===========339修改 2022-03-02 14:07:52 +08:00
jiaoyangna 74b385e4a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-02 13:43:36 +08:00
jiaoyangna e191704a54 【ID1011199】
超值返利图标位置调整
2022-03-02 13:42:58 +08:00
张彪 ee77648eb1 【寻仙招募】奖励预览报错 2022-03-02 13:39:40 +08:00
gaoxin be34fccc5c 【至尊降世】修复领取前三个奖励后入口消失的问题 2022-03-01 18:35:16 +08:00
张彪 6f5aad16b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-24 18:19:50 +08:00
张彪 1ae90cb549 【战力冲刺】修改提交 2022-02-24 18:19:39 +08:00
wangzhenxing e83b649e34 【战斗】=======新增425 426被动 2022-02-24 15:57:12 +08:00
gaoxin 0ce89251f8 【选择神将】报错修复 2022-02-24 02:56:42 +08:00
gaoxin cbc4f3f410 【建木神树】修复神树升级后战斗计算异常 2022-02-24 02:22:16 +08:00