wangzhenxing
|
db8beee485
|
[特效]=======人系施法过程特效修改
|
2021-12-02 14:48:45 +08:00 |
ZhangBiao
|
0b5575c6f2
|
Merge branch 'china/dev' into china/dev_res
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
# Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
# Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
# Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
# Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
# Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
|
2021-12-02 14:39:03 +08:00 |
ZhangBiao
|
73d0e79bb1
|
【连购礼包】资源文件
|
2021-12-02 14:18:21 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
wangzhenxing
|
bca44801ef
|
【特效】=====牛魔王皮肤特效 人系特效弹道修改
|
2021-12-02 13:10:54 +08:00 |
ZhangBiao
|
cf971541e1
|
【大闹天宫】无法挑战修改
|
2021-12-02 10:35:06 +08:00 |
JieLing
|
c61f3eec6f
|
Merge remote-tracking branch 'origin/china/dev' into china/test
|
2021-12-01 18:02:08 +08:00 |
jiaoyangna
|
e7cc7ee41e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-01 17:02:41 +08:00 |
jiaoyangna
|
40fcfcdfc2
|
化身描述修改
|
2021-12-01 17:02:25 +08:00 |
ZhangBiao
|
c637166494
|
【灵兽宝阁】确认框错误修改
|
2021-12-01 16:55:05 +08:00 |
zhangshanxue
|
cce5b85b48
|
Merge branch 'china/dev' into china/test
|
2021-12-01 14:58:35 +08:00 |
ZhangBiao
|
63bf32f335
|
【战斗】白片尝试修改
|
2021-12-01 13:59:22 +08:00 |
ZhangBiao
|
1725c1dc28
|
Revert "【战斗】白片尝试修改"
This reverts commit 0f8a995163 .
|
2021-12-01 13:58:49 +08:00 |
ZhangBiao
|
0f8a995163
|
【战斗】白片尝试修改
|
2021-12-01 13:57:11 +08:00 |
ZhangBiao
|
1805fe0848
|
【装备】出售单个装备报错修改
|
2021-12-01 10:16:42 +08:00 |
luyao
|
ed655ea6a7
|
【优化】
白素贞小头像、半身像
炼丹师半身像
朝向左>右
|
2021-12-01 09:20:55 +08:00 |
zhangshanxue
|
a45b0dce05
|
Merge branch 'china/dev' into china/test
|
2021-11-30 23:16:04 +08:00 |
gaoxin
|
ba0680eac6
|
【战斗】皮肤朝向修改
|
2021-11-30 23:14:06 +08:00 |
wangzhenxing
|
898f3a9b99
|
[立绘朝向]=======英雄列表初始化立绘朝向修改
|
2021-11-30 22:53:49 +08:00 |
zhangshanxue
|
b2fe6814f6
|
Merge branch 'china/dev' into china/test
|
2021-11-30 21:30:40 +08:00 |
gaoxin
|
2e2c4292b6
|
【引导】修复修为引导位置错误
|
2021-11-30 21:27:26 +08:00 |
zhangshanxue
|
d91c88f4d8
|
Merge branch 'china/dev' into china/test
|
2021-11-30 20:51:13 +08:00 |
wangzhenxing
|
6b742c0788
|
[立绘朝向]======皮肤立绘朝向修改
|
2021-11-30 20:43:56 +08:00 |
zhangshanxue
|
4ff2346dc4
|
Merge branch 'china/dev' into china/test
|
2021-11-30 16:48:04 +08:00 |
ZhangBiao
|
9e83ce264d
|
【引导】升级后不弹引导修改
|
2021-11-30 15:43:02 +08:00 |
luyao
|
af560c2aed
|
【音效文件清理】删除过往无用音效
|
2021-11-30 14:23:18 +08:00 |
luyao
|
cf3993fbfb
|
妖系 受击音效调整
|
2021-11-30 14:12:35 +08:00 |
gaoxin
|
f090e9b792
|
【特效】哪吒技能特效时间优化
|
2021-11-30 13:42:49 +08:00 |
gaoxin
|
9fdf7687fa
|
【特效】哪吒技能特效时间优化
|
2021-11-30 13:42:14 +08:00 |
jiaoyangna
|
bd379c4114
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-30 13:23:44 +08:00 |
jiaoyangna
|
12fb7447cc
|
坐骑合成修改
|
2021-11-30 13:23:29 +08:00 |
luyao
|
f4a440e1a3
|
【妖】普攻 受击音效再次调整
|
2021-11-30 12:35:45 +08:00 |
luyao
|
1dc75e4580
|
【妖】普攻 攻击,受击音效;
【道】受击音效修改
|
2021-11-30 12:15:37 +08:00 |
zhangshanxue
|
b30f9c46a9
|
Merge branch 'china/dev' into china/test
|
2021-11-30 11:54:07 +08:00 |
luyao
|
7a8c43ed57
|
添加 人(攻击,受击)、佛(攻击、受击) 普攻音效
|
2021-11-30 11:37:49 +08:00 |
gaoxin
|
25c9e3472a
|
【场景】quick新母包场景创建
|
2021-11-30 11:23:31 +08:00 |
ZhangBiao
|
239d5bbb36
|
【log】日志调整
|
2021-11-30 11:19:28 +08:00 |
wangzhenxing
|
bdb02e9fa4
|
[战斗]=====皮肤立绘朝向修改
|
2021-11-30 11:04:25 +08:00 |
luyao
|
75cd2cf3a3
|
九命猫、逍遥客小头像翻转方向 左>右
|
2021-11-30 10:28:16 +08:00 |
luyao
|
158b202788
|
通天教主小头像方向反转左>右
|
2021-11-30 10:26:48 +08:00 |
wangzhenxing
|
e1d75c6274
|
[战斗]=====增加目标筛选条件
|
2021-11-30 09:58:27 +08:00 |
jiaoyangna
|
5463dbe559
|
提示修改提交
|
2021-11-30 09:35:37 +08:00 |
zhangshanxue
|
f575f18543
|
Merge branch 'china/dev' into china/test
|
2021-11-29 18:49:26 +08:00 |
ZhangBiao
|
db1fd8cc9e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 18:26:02 +08:00 |
ZhangBiao
|
64e7aaac10
|
【百宝商会、灵兽特惠】提交
|
2021-11-29 18:25:39 +08:00 |
wangzhenxing
|
a60c74720c
|
【战斗】=====查找逻辑修改
|
2021-11-29 18:16:49 +08:00 |
wangzhenxing
|
0cef7683ba
|
[战斗]======效果137修改 立绘朝向修改
|
2021-11-29 17:53:17 +08:00 |
gaoxin
|
95251dd5e1
|
【特效】牛魔王特效显示优化
|
2021-11-29 17:42:55 +08:00 |
jiaoyangna
|
658a655f2c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 17:18:06 +08:00 |
jiaoyangna
|
76a94a227e
|
文字大小修改
|
2021-11-29 17:17:50 +08:00 |