Commit Graph

11391 Commits (44df57188d76ea0c4211c2e388d64e0075b4a232)
 

Author SHA1 Message Date
ZhangBiao 44df57188d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 15:45:48 +08:00
ZhangBiao 4b27fa6a1b 【副本】灰色红点提交 2021-12-20 15:45:06 +08:00
jiaoyangna d947607282 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 15:44:10 +08:00
jiaoyangna b841b77467 关卡解锁跳转添加提交 2021-12-20 15:43:54 +08:00
wangzhenxing 885a6e2fa8 [功能]========结算记录界面添加阵亡标签 2021-12-20 15:32:28 +08:00
ZhangBiao 12b980590f 【名望】提交 2021-12-20 15:18:03 +08:00
ZhangBiao 777b353f4f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 15:02:41 +08:00
ZhangBiao 680b956474 【声望】修改 2021-12-20 15:02:14 +08:00
jiaoyangna 5ab2f2f40a 关卡tips 关卡条件修改提交 2021-12-20 14:56:43 +08:00
jiaoyangna 7a9b2b20c6 玉帝剧情新手引导修改提交 2021-12-20 14:17:49 +08:00
jiaoyangna cddbe10d1a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 14:15:29 +08:00
jiaoyangna d1fd74db04 【ID1019430】
【神将回退】光效穿透
2021-12-20 14:15:14 +08:00
ZhangBiao 6d93ab7dca Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 14:05:56 +08:00
ZhangBiao 8b7b5c8fa9 【连购礼包】无礼包修改 2021-12-20 14:05:42 +08:00
jiaoyangna 997aa4831f 至尊降世添加拍脸 2021-12-20 13:41:16 +08:00
jiaoyangna 7002f1ac42 关卡提示修改 2021-12-20 13:10:58 +08:00
jiaoyangna 84e181ef1a ID1010877】
【优化】跳过提示文字优化
2021-12-20 13:07:24 +08:00
jiaoyangna f306f0141d 删除log 2021-12-20 12:55:22 +08:00
jiaoyangna 76c682eb68 【神将回退】将魂足够升星时,进阶页签不显示红点 2021-12-20 12:05:11 +08:00
jiaoyangna b7b71930f5 进阶预览黑屏修改提交 2021-12-20 11:33:36 +08:00
jiaoyangna 5148c3fb85 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 11:32:39 +08:00
jiaoyangna bf73593d04 进阶预览提交 2021-12-20 11:32:23 +08:00
ZhangBiao 9fa6f3a2b3 【奖励详情】报错修改 2021-12-20 10:30:51 +08:00
ZhangBiao 834cdf87da 【新将来袭】取消珍奇宝阁 2021-12-17 18:59:54 +08:00
ZhangBiao 795d19d63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:53:34 +08:00
ZhangBiao 0377b2b642 【特惠商城】提交 2021-12-17 18:53:24 +08:00
jiaoyangna 415fc7cb35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:46:19 +08:00
jiaoyangna e6796ee70f 超值返利修改提交 2021-12-17 18:46:05 +08:00
ZhangBiao 034aff624f 【资源】提交 2021-12-17 18:36:47 +08:00
ZhangBiao 38966d1b16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:35:40 +08:00
ZhangBiao 72b0f31d50 【特惠商城】提交 2021-12-17 18:25:45 +08:00
jiaoyangna 82712c6047 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:13:42 +08:00
jiaoyangna f441e7a7ea 适配修改提交 2021-12-17 18:13:14 +08:00
luyao 44eb9decb8 【至尊降世】豪华月卡图标 2021-12-17 18:11:25 +08:00
jiaoyangna 196cb329b3 提示文字修改提交 2021-12-17 17:48:26 +08:00
jiaoyangna 4a9463fe5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:42:19 +08:00
jiaoyangna 6573b10a59 资源提交 2021-12-17 17:42:00 +08:00
wangzhenxing ef680be056 [战斗]======护盾效果修改 2021-12-17 17:31:58 +08:00
ZhangBiao 88980286eb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:20:24 +08:00
ZhangBiao 08806bc18f 【寻仙招募】改为常驻后,奖励中的概率有效期去掉 2021-12-17 17:20:13 +08:00
jiaoyangna 5c042b2c60 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:19:58 +08:00
jiaoyangna 893cd69527 特效被切修改提交 2021-12-17 17:19:30 +08:00
ZhangBiao df483145bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:13:57 +08:00
ZhangBiao a9b7c21fad 【道具弹窗】跳转按钮错位 2021-12-17 17:13:45 +08:00
jiaoyangna 7e444d54c6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 16:55:50 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
jiaoyangna a16931b9dc 文字位置修改提交 2021-12-17 16:55:23 +08:00
jiaoyangna 6b234c7f2f 文字重叠修改提交 2021-12-17 16:53:26 +08:00
jiaoyangna 3119f9b277 价格描述修改 2021-12-17 16:43:24 +08:00
jiaoyangna 16c00cbffc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 16:41:26 +08:00