Commit Graph

11261 Commits (abb068e9cbbe08dcd85486ee88bba3ab452793cc)
 

Author SHA1 Message Date
gaoxin b8137b0d7c 【点将台】尝试修复山河社稷图黑屏 2021-12-02 04:33:57 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
zhangshanxue 134ef16579 Merge branch 'china/dev' into china/test 2021-11-27 22:00:02 +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 a5fb77cf9d 【特效】人道 transform -> rectTransform 2021-11-27 14:57:15 +08:00