gaoxin
|
b516397443
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-19 14:54:12 +08:00 |
gaoxin
|
59937a1132
|
【战斗】修改自动下落特效的时间为表配置
|
2020-11-19 14:53:45 +08:00 |
gaoxin
|
680e3eb9e6
|
【资源】阿修罗特效裁切问题修改
|
2020-11-19 14:51:48 +08:00 |
gaoxin
|
8c692349db
|
【资源】修复聂小倩光效切割问题,修复阿修罗释放特效错误的问题
|
2020-11-19 14:37:51 +08:00 |
jiaoyangna
|
d8f31bab35
|
主题活动修改提交
|
2020-11-19 14:26:57 +08:00 |
gaoxin
|
a96b128965
|
【资源】鬼差,木吒,水德星君光效切割问题修复
|
2020-11-19 13:52:44 +08:00 |
jiaoyangna
|
2a9b4cb5ab
|
动态立绘修改
|
2020-11-19 11:49:34 +08:00 |
jiaoyangna
|
e09872eb7f
|
限时招募修改提交
|
2020-11-19 10:35:21 +08:00 |
jiaoyangna
|
3e7c24c029
|
【主题活动】降龙伏虎
|
2020-11-18 18:15:50 +08:00 |
gongjiawei
|
06b3930263
|
音频更新
|
2020-11-18 17:35:12 +08:00 |
gaoxin
|
ca1a509cb8
|
【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题
|
2020-11-17 21:40:36 +08:00 |
gaoxin
|
6be65652c5
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-17 20:40:29 +08:00 |
gaoxin
|
ea5afc1ac3
|
【战斗】无用log删除
|
2020-11-17 20:40:23 +08:00 |
gaoxin
|
77934cd274
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-17 20:39:38 +08:00 |
gaoxin
|
4eb60838b4
|
【战斗】修复被动112参数错误
|
2020-11-17 20:39:28 +08:00 |
zhangqiang
|
a109678fb4
|
【逍遥游】 天赋图标显示赋值
|
2020-11-17 20:12:36 +08:00 |
gaoxin
|
f7676f2c93
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_01.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_02.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_03.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014_mat.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82.tga.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82_tga.tga.meta
|
2020-11-17 18:38:24 +08:00 |
gaoxin
|
f174c68db7
|
【资源】东华帝君普通攻击特效添加
|
2020-11-17 18:32:38 +08:00 |
gaoxin
|
be0195af18
|
【战斗】战斗表现添加射线类型特凶啊
|
2020-11-17 18:31:11 +08:00 |
gaoxin
|
05076eb743
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-17 18:30:45 +08:00 |
gaoxin
|
d3a276cdca
|
【测试战斗】皮肤加入本地数据保存
|
2020-11-17 18:30:37 +08:00 |
wangzhenxing
|
84a28f8a28
|
[战斗] 196 被动 添加类型判断
|
2020-11-17 18:44:31 +09:00 |
zhangqiang
|
7cf3d312d2
|
【特效】 特效添加RectTransform
|
2020-11-17 17:04:19 +08:00 |
wangzhenxing
|
3308ce4479
|
[战斗] 被动处理 舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽
|
2020-11-17 17:35:25 +09:00 |
zhangqiang
|
8980c6be4a
|
【英雄战力】 乘减算修改
|
2020-11-17 15:33:45 +08:00 |
gaoxin
|
479c836292
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-17 15:14:31 +08:00 |
ZhangBiao
|
bdf45413bc
|
【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
|
2020-11-17 14:56:42 +08:00 |
ZhangBiao
|
2dd30f9ca3
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:55:21 +08:00 |
ZhangBiao
|
88d1be5daf
|
Revert "【森罗幻境】敌将详情 敌将位置调整"
This reverts commit f1402772f9.
|
2020-11-17 14:53:27 +08:00 |
ZhangBiao
|
f1402772f9
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:51:25 +08:00 |
gaoxin
|
6a515c2374
|
【战斗】优化战斗资源回收机制,修复跳过战斗时灵兽报错
|
2020-11-17 14:05:46 +08:00 |
gaoxin
|
8f3325ad5f
|
【战斗】修复灵兽释放技能时跳过战斗,下次战斗会显示上次战斗的casting的问题
|
2020-11-17 14:04:23 +08:00 |
ZhangBiao
|
db9facba90
|
【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
(cherry picked from commit 04f8571692)
|
2020-11-17 11:54:58 +08:00 |
ZhangBiao
|
13496de590
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-17 11:54:04 +08:00 |
ZhangBiao
|
04f8571692
|
【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
|
2020-11-17 11:53:49 +08:00 |
ZhangBiao
|
90f0ea6b67
|
【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
(cherry picked from commit 69d818118c)
|
2020-11-17 10:59:48 +08:00 |
ZhangBiao
|
e6d0c6b0f2
|
【公告】打开公告前获取公告信息
|
2020-11-17 10:58:54 +08:00 |
zhangqiang
|
cd332c80d0
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-17 10:58:09 +08:00 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
ZhangBiao
|
69d818118c
|
【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
|
2020-11-17 10:56:21 +08:00 |
ZhangBiao
|
d433d2a690
|
【公告】打开公告前获取公告信息
|
2020-11-17 10:44:55 +08:00 |
wangzhenxing
|
383f20aa32
|
【战斗】 被动266去除无用log
|
2020-11-17 10:02:29 +09:00 |
zhangqiang
|
2955a067fa
|
【觉醒】 图鉴未开觉醒功能点进去报错修复提交
|
2020-11-16 21:00:23 +08:00 |
gaoxin
|
9c158f1f99
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
|
2020-11-16 20:16:17 +08:00 |
zhangqiang
|
26e7460699
|
【孙悟空】皮肤攻击音效
|
2020-11-16 19:55:06 +08:00 |
gaoxin
|
58c538e41b
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-16 18:34:24 +08:00 |
gaoxin
|
46750846f8
|
【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。
|
2020-11-16 18:34:12 +08:00 |
zhangqiang
|
a22effc57c
|
【东华帝君】 音效替换 技能预设 修改
|
2020-11-16 18:08:01 +08:00 |
zhangqiang
|
c73c2404f1
|
【东华帝君】 音效替换 技能预设 修改
|
2020-11-16 18:07:29 +08:00 |
ZhangBiao
|
f384e25ad6
|
【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19)
|
2020-11-16 17:51:25 +08:00 |