Commit Graph

9660 Commits (b6c01c82cf2b62459435d303c048b0de71cd1916)

Author SHA1 Message Date
ZhangBiao 3cf80812c0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 14:08:16 +08:00
ZhangBiao b90afb39f2 【灵兽特惠】提交 2021-11-29 14:08:07 +08:00
gaoxin c035221989 【剧情】立绘和文字出现的节奏调整 2021-11-29 13:50:29 +08:00
ZhangBiao 38f70b2c8d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:41:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
skuld 42923df528 bat Resource Commit:2021/12/08,15:42:15 2021-12-08 15:42:16 +08:00
wangzhenxing 2c6282e883 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 13:21:52 +08:00
wangzhenxing 1eb6115bc9 [角色朝向]=======立绘朝向修改 2021-11-29 13:21:23 +08:00
gaoxin 6c6ce74081 【立绘】伏羲立绘删除脚下的阵 2021-11-29 13:20:45 +08:00
jiaoyangna e92063853e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-29 10:15:07 +08:00
jiaoyangna d931fa07f8 身外化身重复修改提交 2021-11-29 10:14:52 +08:00
luyao c7ee28efc7 【神将朝向】逍遥客 左>右 2021-11-29 10:00:10 +08:00
luyao f68f821c03 【朝向调整】九命猫t3牌 左>右 2021-11-29 09:48:20 +08:00
jiaoyangna c2638629e7 化身两个修改提交 2021-11-29 09:40:41 +08:00
gaoxin 030fea312a 【立绘】立绘回收时,方向还原 2021-12-02 04:34:30 +08:00
gaoxin b8137b0d7c 【点将台】尝试修复山河社稷图黑屏 2021-12-02 04:33:57 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
luyao 5deba7853a 【资源】头像转向 2021-11-27 19:47:34 +08:00
gaoxin 7c9741c522 【资源】普通特效优化 道 2021-12-02 01:56:56 +08:00
gaoxin 0efa821585 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:44:34 +08:00
gaoxin 0d1c025624 【活动】连续礼包,添加 2021-12-02 01:44:29 +08:00
gaoxin 28538e89b0 【GM】添加剧情测试的GM 2021-12-02 01:13:52 +08:00
gaoxin 2a98efbaad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:08:51 +08:00
gaoxin d5d83a5c7e 【资源】资源名重复修改 2021-12-02 01:08:38 +08:00
gaoxin c8a1f45b41 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 01:07:06 +08:00
gaoxin 8a960ece3b 【关卡】添加剧情关卡 2021-12-02 01:06:34 +08:00
jiaoyangna 9a61491b90 资源条修改提交 2021-11-27 18:28:11 +08:00
jiaoyangna f036036f09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 18:13:03 +08:00
jiaoyangna 5fb0af7e00 颜色修改提交 2021-11-27 18:12:37 +08:00
jiaoyangna da2cff54a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:59:23 +08:00
jiaoyangna 07057901bc 十连抽修改 2021-11-27 17:59:07 +08:00
wangzhenxing dcd16e5450 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:50:09 +08:00
ZhangBiao 27abdede9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:21:33 +08:00
ZhangBiao 14b6087d77 【神将来源】获取途径报错修改 2021-11-27 17:21:24 +08:00
wangzhenxing 58f41eb758 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:18:38 +08:00
wangzhenxing dd248f37f6 [角色朝向]======进阶展示,皮肤显示,好感度 2021-11-27 17:18:04 +08:00
jiaoyangna dfb79c03d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 17:14:47 +08:00
jiaoyangna 37de4c4450 文字显示报错修改 2021-11-27 17:13:28 +08:00
ZhangBiao a8e619b8c6 【乾坤宝盒】去除珍奇宝阁 2021-11-27 17:03:58 +08:00
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
wangzhenxing d099ddafa3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:35:13 +08:00
ZhangBiao 1775784bcd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:34:59 +08:00
wangzhenxing bc39b34a73 [战中表现]=====角色释放技能表现位置修改 2021-11-27 16:34:46 +08:00
gaoxin 58ce5ad4d8 【战斗】测试战斗跳过按钮遮挡 2021-11-27 16:28:54 +08:00
wangzhenxing 0ce834e220 【立绘朝向】=====备战界面修改,战斗记录界面灵兽显示主角修改 2021-11-27 16:25:21 +08:00
jiaoyangna ae826de307 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 16:16:38 +08:00
luyao e4f02f3c7c 【神将头像t1左>右】【神将缩微图t3 部分左>右】 2021-11-27 16:16:01 +08:00
jiaoyangna 41ae610a31 变身卡界面修改提交 2021-11-27 16:14:59 +08:00
wangzhenxing cbcead2f50 【身外化身】=======化身位置修改 2021-11-27 15:45:21 +08:00
jiaoyangna 12e091408d 层级修改 2021-11-27 15:37:48 +08:00
ZhangBiao d8956e0fe2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:31:17 +08:00
ZhangBiao b83dc76f7b 【灵兽特惠】时间显示修改 2021-11-27 15:30:49 +08:00
jiaoyangna 904adf1d16 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:30:02 +08:00
jiaoyangna e9862a7046 抽卡提示修改提交 2021-11-27 15:29:46 +08:00
gaoxin 2061e3ae03 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:17:09 +08:00
gaoxin ee5b4a79a8 【资源】图片大小优化 2021-11-27 15:16:57 +08:00
wangzhenxing d639b2d29b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:15:00 +08:00
wangzhenxing 85a12ae9d8 [身外化身]========身外化身立绘朝向修改 2021-11-27 15:14:22 +08:00
gaoxin d253668aef 【战斗】修复按钮被立绘遮挡 2021-11-27 15:13:35 +08:00
luyao d4b6fdb128 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 15:04:09 +08:00
luyao d6678a0246 【资源】卡牌左->右 2021-11-27 15:03:54 +08:00
luyao 03c313b6c9 【音效】妖道普通攻击音效 2021-11-27 15:00:31 +08:00
gaoxin f86bb0d997 【特效】人道 transform -> rectTransform 2021-11-27 14:57:31 +08:00
gaoxin 72cd7fde38 【特效】四阵营普攻特效优化 人 道 2021-11-27 14:41:54 +08:00
jiaoyangna f6c0b80512 位置修改提交 2021-11-27 14:32:57 +08:00
jiaoyangna ecc3aff607 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 14:31:17 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
wangzhenxing fd81a89c96 【战斗表现】========变身卡展示位置修改 2021-11-27 13:56:37 +08:00
jiaoyangna 767d4589c7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-27 13:54:56 +08:00
skuld e520475181 bat Resource Commit:2021/12/03,13:38:14 2021-12-03 13:38:14 +08:00
jiaoyangna 04987414e9 图片修改提交 2021-11-27 13:54:36 +08:00
wangzhenxing 3c22a1ef6c [立绘朝向]======静态立绘朝向改回原样 2021-11-27 13:17:36 +08:00
wangzhenxing c80968098c 【立绘朝向】=============装备界面立绘朝向 2021-11-27 13:01:27 +08:00
gaoxin 060a380305 【战斗】跳过按钮进度显示优化 2021-11-26 19:41:10 +08:00
jiaoyangna 83946b29f2 变身卡详情修改提交 2021-11-26 19:37:27 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
jiaoyangna 97c23fb3cb 变身卡自选箱修改提交 2021-11-26 18:51:56 +08:00
jiaoyangna dd232c96d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 18:30:39 +08:00
jiaoyangna 5bba220ad5 添加跳转 2021-11-26 18:30:08 +08:00
gaoxin 41d60d9f5e 【特效】修复道特效显示错误 2021-11-26 18:26:54 +08:00
jiaoyangna 80fb3c9108 添加tips 2021-11-26 18:20:03 +08:00
jiaoyangna 129e2e5c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 18:10:18 +08:00
jiaoyangna 410fb55f66 天地烘炉提交 2021-11-26 18:10:02 +08:00
wangzhenxing 587a5cfc2e [战斗]=======133 136 137效果修改 2021-11-26 18:05:16 +08:00
jiaoyangna 4a82bcc664 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:54:55 +08:00
jiaoyangna 1a40cfba00 天地烘炉提交 2021-11-26 17:54:35 +08:00
ZhangBiao df360d853d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:26:40 +08:00
ZhangBiao bb7c738cd1 【每日礼包】banner修改 2021-11-26 17:26:30 +08:00
gaoxin 0ddf804234 【战斗】战斗结构调整 2021-11-26 17:20:28 +08:00
wangzhenxing a6bf54daaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:08:20 +08:00
jiaoyangna 2814265ba7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 17:06:24 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
wangzhenxing 13e0ab29ba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 16:56:01 +08:00
wangzhenxing 69e30d908c [立绘朝向]===============我方立绘展示朝向修改 2021-11-26 16:55:13 +08:00
ZhangBiao ed45f56479 【主角】未到开启等级有红点 2021-11-26 16:44:01 +08:00
ZhangBiao f1d4a449b0 【资源提交】 2021-11-26 16:30:26 +08:00
ZhangBiao 7e1039bf3b 【灵脉秘境】特效 2021-11-26 15:43:39 +08:00
ZhangBiao 5c7ba2529d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 15:15:23 +08:00
ZhangBiao b33ee1b006 【灵脉秘境】特效提交 2021-11-26 15:15:10 +08:00
gaoxin 044137ed72 【音效】新普通攻击音效 2021-11-26 15:08:00 +08:00