Commit Graph

8932 Commits (2f84d554cc4c6be72af16c432aa29d2df8fad5f9)

Author SHA1 Message Date
yuanshuai 0c3dec451f 化身bug修改 2022-04-26 13:33:41 +08:00
yuanshuai 8a7c4160f0 背包页签修改 2022-04-26 11:56:20 +08:00
yuanshuai f0cb395539 背包页签修改 2022-04-26 11:45:13 +08:00
wangzhenxing 1f37ce3b4e 【战斗】========被动438修改 2022-04-26 11:14:49 +08:00
yuanshuai 92e56472de 天宫商店点击报错 bug修改 2022-04-26 10:14:52 +08:00
wangzhenxing d3a8722b95 图鉴修改 2022-04-25 20:35:17 +08:00
wangzhenxing 139a2de8d2 背包描述修改 2022-04-25 20:06:16 +08:00
wangzhenxing adef176142 [战斗]======被动304修改 2022-04-25 20:03:44 +08:00
yuanshuai 868eb69aa6 挑战副本bug修改 2022-04-25 19:33:11 +08:00
yuanshuai fd6f30e459 挑战副本bug修改 2022-04-25 18:56:48 +08:00
yuanshuai 626a2a98ef 化身bug修改 2022-04-25 18:48:27 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai 55833325bf 跨服相关修改 2022-04-25 17:57:31 +08:00
yuanshuai 21342783bd 化身卡界面修改 2022-04-25 16:23:41 +08:00
yuanshuai 7c543952e5 身外化身界面修改 2022-04-25 15:52:46 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing 7de86a79eb Merge branch 'china/dev' into china/test 2022-04-25 13:51:38 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00
yuanshuai dcf1e29c3a 界面优化 2022-04-25 11:52:09 +08:00
wangzhenxing 4b9d210499 屏蔽神阵营,屏蔽招募 2022-04-25 11:31:32 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
wangzhenxing aad7541dbd 挑战副本不显示倒计时 2022-04-24 21:31:49 +08:00
wangzhenxing 3678f78c75 神印币添加跳转 2022-04-24 21:26:32 +08:00
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +08:00
wangzhenxing 4792186f71 天书密卷屏蔽 装备篇 2022-04-24 18:32:44 +08:00
wangzhenxing 4fb96bca23 结算界面特效穿透问题修改 2022-04-24 18:27:53 +08:00
wangzhenxing 043f174f08 神印开始条件显示 2022-04-24 17:19:34 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
wangzhenxing e498661919 神印添加背包分解 2022-04-24 16:36:27 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing fed9afed62 [战斗]======目标选择逻辑添加空判断 2022-04-24 11:38:41 +08:00
yuanshuai 1114c62c97 添加一键放入 2022-04-22 19:29:10 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
wangzhenxing e025824de6 添加报错处理 2022-04-22 13:17:58 +08:00
yuanshuai d247989586 挑战副本bug修改 2022-04-21 18:43:24 +08:00
wangzhenxing 61a52f4239 [变身卡]=======处理变身卡报错 2022-04-21 17:23:57 +08:00
yuanshuai dc8704a806 探索商店跳转入口添加 2022-04-28 10:48:08 +08:00
yuanshuai bf52645eb7 挑战副本优化 2022-04-25 18:20:53 +08:00
wangzhenxing f49bb38f8f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 16:20:41 +08:00
wangzhenxing 3021107155 globaldefine提交 2022-04-20 16:20:24 +08:00
yuanshuai 5217d75b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-20 13:23:25 +08:00
yuanshuai 50683260c7 挑战副本红点提交 2022-04-20 13:23:08 +08:00
wangzhenxing ba45227ed1 [战斗]======去掉log 2022-04-20 13:22:26 +08:00
wangzhenxing 0cad07009a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-19 17:24:53 +08:00
wangzhenxing 53e7c44e2a [战斗]=======战斗提交 2022-04-19 17:23:37 +08:00
yuanshuai 804b2c3f4d 挑战副本bug修改 2022-04-19 16:50:03 +08:00
yuanshuai 3c72cd688b 挑战副本bug修改 2022-04-19 16:14:55 +08:00
yuanshuai 24bf6c63e4 挑战副本脚本修改 2022-04-19 15:52:50 +08:00
yuanshuai b907383826 挑战副本脚本修改 2022-04-19 11:53:08 +08:00
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
yuanshuai f8f14d06e9 挑战副本修改 2022-04-18 00:03:41 +08:00
yuanshuai bd3bed7e41 挑战副本脚本提交 2022-04-15 11:48:52 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
yuanshuai d39933b48d 红点提交 2022-05-18 20:06:18 +08:00
wangzhenxing d4a6bfdda2 【神将排版优化】========神将信息界面修改 2022-05-18 20:00:57 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
wangzhenxing 4a4ea1c784 【排行榜】=======关卡排行改山河设计图星星排行报错修改 2022-05-18 14:52:58 +08:00
wangzhenxing 8eec6cb793 【关卡排行】=====关卡界面关卡排行榜修改 2022-05-18 13:48:03 +08:00
wangzhenxing 05b20af01f [排行榜]=======主界面排行榜显示修改 2022-05-17 17:46:39 +08:00
yuanshuai c9dfe177e6 百抽派送活动提交 2022-05-17 13:23:15 +08:00
wangzhenxing ac6e551a1f 【车迟斗法】=====入口提示修改 2022-05-17 10:35:54 +08:00
wangzhenxing b31dae947c 【抽卡】========抽卡提示 2022-05-16 18:20:17 +08:00
wangzhenxing 46499a8401 【车迟斗法】=======屏蔽车迟斗法开服七天后才能进入 2022-05-16 16:09:21 +08:00
wangzhenxing 09f2f05214 【战斗】=====如果之前是3倍速,就转成二倍速 2022-05-16 13:40:53 +08:00
wangzhenxing e337559c30 【战斗】=======屏蔽战斗三倍数,2倍速改为2.5倍速 2022-05-16 13:23:16 +08:00
wangzhenxing a7d570255b 【跳过】================战斗跳过功能提示修改 2022-05-16 13:03:54 +08:00
wangzhenxing 2ed317bc2c 摘星阁修改,备战阵营图标显示修改 2022-04-07 15:09:04 +08:00
wangzhenxing 5afe0f400b 洞府装备加成显示修改 2022-04-07 11:45:51 +08:00
wangzhenxing abd83b945a 【bug】======英雄升星属性显示修改 2022-04-07 10:33:55 +08:00
wangzhenxing 9d772eab4c 【bug】=====心魔助战英雄修改 2022-04-06 16:21:34 +08:00
wangzhenxing 50c78ef888 【bug】======转换职业后卸下魂宝 2022-04-06 14:15:36 +08:00
wangzhenxing f442f6df70 globaldefine提交 2022-04-06 13:56:39 +08:00
wangzhenxing e0ec7f2dec [bug]====英雄信息修改 2022-04-02 17:47:30 +08:00
wangzhenxing 0a52e4a549 [bug]=====神系英雄修改提交 2022-04-02 16:03:18 +08:00
jiaoyangna 17f855be9f 【ID1011382】
进阶好礼
2022-04-02 15:43:29 +08:00
jiaoyangna bfdc6d72b9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-04-02 14:45:36 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing 3c1986c71c 【神魂】=====神魂升级屏蔽神系转换职业的英雄 2022-04-01 18:41:10 +08:00
wangzhenxing 9a2f342ef7 【功能】======寻仙招募优化 2022-04-01 17:10:37 +08:00
wangzhenxing e9219317e2 【bug】=====森罗幻境修改 2022-04-01 16:01:36 +08:00
wangzhenxing f44f70085b 【bug】=====七界阵容条件修改 2022-04-01 15:09:57 +08:00
wangzhenxing e8c27a0596 【bug】======四灵修改 2022-04-01 14:02:07 +08:00
wangzhenxing a3e166a05e 【bug】=====英雄列表排序修改 2022-03-31 18:11:08 +08:00
wangzhenxing 88d80be02b 【bug】============神系转换职业修改 2022-03-31 17:25:43 +08:00
wangzhenxing 6d7dcce74f [bug]======无尽副本编对界面修改 2022-03-31 16:00:27 +08:00
wangzhenxing 764f61cfb2 [bug]=====飞升界面英雄临时数据修改 2022-03-31 14:29:25 +08:00
wangzhenxing eff2800c35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-31 09:51:26 +08:00
wangzhenxing 3e625b9fd0 [功能]=======英雄合成,英雄置换修改提交 2022-03-31 09:51:10 +08:00
wangzhenxing 24a92b6b98 [战斗]=======被动387修改 2022-03-30 17:12:03 +08:00
jiaoyangna 4252fde78f 【ID1011380】
装备和宝石属性修正

(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae)
2022-03-30 13:40:37 +08:00
zhangshanxue 810fd2cacb Merge branch 'china/dev' into china/test 2022-03-29 17:04:16 +08:00
jiaoyangna 82dd52e57c 红点修改提交 2022-03-29 16:41:19 +08:00
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
zhangshanxue a6fa8cdc4b Merge branch 'china/dev' into china/test 2022-03-28 11:06:34 +08:00
wangzhenxing c593cdf2d6 [bug]======寻宝特效穿透修改 2022-03-25 14:12:19 +08:00
jiaoyangna ef74528bc7 对充值活动进行关闭 2022-03-23 16:23:31 +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
wangzhenxing def9ca5701 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 17:38:57 +08:00
wangzhenxing 47a9fc98e3 globaldefine常量提交 2022-03-21 17:38:27 +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
jiaoyangna d0b2ff1cd8 协议提交 2022-03-18 13:22: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 e1c73c954f 协议修改提交 2022-03-11 15:55:05 +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 ce063bda0a 【ID1011337】
【优化】车迟斗法抢夺目标 ,玩家积分显示
2022-03-10 16:32:28 +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
jiaoyangna a6cc38d08b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-03 16:25:23 +08:00
jiaoyangna b210eec0df 协议提交 2022-03-03 16:25:05 +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
gaoxin 43133199cf 【云梦豪礼】修复奖励无法领取的问题 2022-02-24 00:20:58 +08:00
jiaoyangna cadc9337da 删除log 2022-02-23 18:34:10 +08:00
jiaoyangna 88a67b0cbf 至尊降世修改提交 2022-02-23 18:33:40 +08:00
jiaoyangna 57198fce39 至尊降世兼容提交 2022-02-23 18:12:22 +08:00
jiaoyangna 6abf049eb7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-23 17:24:49 +08:00
jiaoyangna d0720e17b2 【ID1011178】
至尊降世活动拉到1000档
2022-02-23 17:24:34 +08:00
wangzhenxing 255603a71a [战斗]==========被动375修改 2022-02-23 14:36:31 +08:00
gaoxin 30e7ef5bd5 【无尽副本】加入神将版本控制判断 2022-02-22 14:20:02 +08:00
jiaoyangna 3cecd32fda 【ID1019545】
【公会技能】长按升级至道具不足,继续长按显示升级成功
2022-02-22 11:04:41 +08:00
jiaoyangna 1905b3c175 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-21 18:37:18 +08:00
jiaoyangna 3ccf3c29a3 ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-21 18:36:21 +08:00
wangzhenxing 51e89fea29 英雄觉醒后天赋显示修改 2022-02-21 14:25:52 +08:00
gaoxin 096d0d0dc4 【无尽副本】编队列表加入神将版本判断 2022-03-02 13:42:48 +08:00
gaoxin 84f21cbd9b 【推荐阵容】加入神将版本判断 2022-03-02 13:28:07 +08:00
张彪 9345c31d8b 【战力冲刺】提交 2022-02-21 10:40:27 +08:00
张彪 b51c7b7780 【战力冲刺】提交 2022-02-18 17:02:27 +08:00
张彪 05b9c3afa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 16:28:02 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
wangzhenxing 92f3dee3ab 【战斗】==========被动226 423 424修改添加提交 2022-02-18 16:26:33 +08:00
jiaoyangna 70cc76deb4 恭送神将排序修改提交 2022-02-18 15:32:42 +08:00
jiaoyangna fbb86f7263 恭送神将排序修改提交 2022-02-18 15:31:50 +08:00
jiaoyangna bfd2ff46a7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:18:09 +08:00
jiaoyangna 2986b3964a 魂印图鉴修改提交 2022-02-18 15:17:28 +08:00
张彪 3aa934a95e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:14:33 +08:00
张彪 51196cf150 【灵兽宝阁】新增几档灵兽特惠礼包界面提交 2022-02-18 15:14:25 +08:00
jiaoyangna 42a60c158f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:09:25 +08:00
jiaoyangna 1bd0fe5562 魂印修改提交 2022-02-18 15:08:45 +08:00
张彪 7083b34f51 【战力冲刺】提交 2022-02-18 14:05:59 +08:00
张彪 f9fca9ca93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-17 17:14:46 +08:00
张彪 a6d0a4f7f0 【战力冲刺】提交 2022-02-17 17:14:33 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
jiaoyangna a76616df31 【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-17 15:13:26 +08:00
gaoxin 0933331d4a 【神将】加入版本控制时间计算错误修改 2022-02-24 16:50:36 +08:00
gaoxin bfbc3b7195 【拍脸】寻仙招募界面显示错误修改 2022-02-24 16:49:19 +08:00
gaoxin 545e06c474 Merge branch '0功能/寻仙招募拍脸' into china/dev 2022-02-24 15:57:18 +08:00
gaoxin 63343f88c7 【拍脸】寻仙招募拍脸跳转添加引导小手 2022-02-24 15:56:53 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
wangzhenxing 5b3c82f0b3 【bug】=======图鉴觉醒信息显示修改 2022-02-15 10:43:13 +08:00
jiaoyangna 4ea5d98b31 每日豪礼修改提交 2022-02-15 10:36:08 +08:00
gaoxin f9f34a9d46 【天书密卷】加入神将是否进入版本判断 2022-02-11 17:07:07 +08:00
wangzhenxing 3fde93fcd7 【战斗】=========效果108修改 2022-02-11 16:27:27 +08:00
gaoxin c2b4647418 【限时Up】加入神将版本判断 2022-02-11 16:22:44 +08:00
gaoxin 0ec5cf102a 【心愿】判断神将是否加入版本 2022-02-11 16:11:58 +08:00
gaoxin 2b413264fd 【头像】加入英雄是否进入版本判断-删除log 2022-02-11 16:06:38 +08:00
gaoxin a2ee17f6c3 【头像】加入英雄是否进入版本判断 2022-02-11 16:05:51 +08:00
jiaoyangna 7a010e5e7d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-11 15:58:16 +08:00