Fuhaifeng
|
5d00d1adf0
|
BtView 事件防止注入
|
2020-12-18 13:56:58 +08:00 |
Fuhaifeng
|
798fe1debe
|
no message
|
2020-12-18 10:08:23 +08:00 |
Fuhaifeng
|
1c89a5c8cd
|
Kua脚本优化。UI框架,RoleList Bag 协程加载。 UIManager1,2,3,4
|
2020-12-17 19:39:52 +08:00 |
Fuhaifeng
|
b3eb231d0b
|
no message
|
2020-12-15 19:18:00 +08:00 |
zhangqiang
|
21683ce406
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 10:10:41 +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 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
gaoxin
|
5ab9688089
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 16:46:33 +08:00 |
zhangqiang
|
2000240f64
|
【觉醒】 提示文字
|
2020-11-16 14:57:46 +08:00 |
gaoxin
|
8b001af5b6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Atlas/RoleInfoAtlas/r_hero_juexinchengong.png.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
|
2020-11-13 19:48:27 +08:00 |
zhangqiang
|
2f5b2c2d4f
|
【觉醒】 觉醒成功界面显示bug
|
2020-11-13 10:11:41 +08:00 |
zhangqiang
|
cbf9f5cade
|
【觉醒】问题修改
|
2020-11-12 13:55:46 +08:00 |
zhangqiang
|
1615d0c2d2
|
【觉醒】问题修改
|
2020-11-12 13:55:15 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |
zhangqiang
|
adf9c87ac2
|
【灵兽提交】bug修改
|
2020-11-11 20:21:13 +08:00 |
zhangqiang
|
82a2d14bb6
|
【觉醒】bug
|
2020-11-11 20:19:54 +08:00 |
zhangqiang
|
dcde0cf4ce
|
【灵兽提交】bug修改
|
2020-11-11 19:50:49 +08:00 |
zhangqiang
|
f746575b10
|
Merge branch '0功能/神将觉醒' into master_develop
|
2020-11-11 11:38:43 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
90e9e84c64
|
【觉醒】十一星的星级展示修改
|
2020-11-11 11:12:14 +08:00 |
zhangqiang
|
053de93608
|
【神将觉醒】 提交
|
2020-11-10 18:35:37 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
gaoxin
|
5a6b83ebe6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Language.lua
|
2020-11-10 10:41:02 +08:00 |
jiaoyangna
|
22d3761937
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 10:24:07 +08:00 |
jiaoyangna
|
3f7ae45011
|
皮肤修改
|
2020-11-10 10:23:55 +08:00 |
zhangqiang
|
10db1d34b3
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:17:42 +08:00 |
zhangqiang
|
6278bb0cc8
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:23 +08:00 |
zhangqiang
|
92d85c4200
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:01 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
zhangqiang
|
85b21b27f0
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-09 18:04:54 +08:00 |
zhangqiang
|
d3283d8094
|
【神将升级】 太快优化
|
2020-11-09 16:29:22 +08:00 |
zhangqiang
|
c4a466637f
|
【神将升级】 太快优化
|
2020-11-09 16:29:06 +08:00 |
zhangqiang
|
f94c84f1cd
|
【觉醒】 增加觉醒页签
|
2020-11-09 15:04:48 +08:00 |
zhangqiang
|
de677bee2f
|
【觉醒】增加脚本
|
2020-11-09 11:13:53 +08:00 |
zhangqiang
|
5c73587f89
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-09 10:16:16 +08:00 |
jiaoyangna
|
f26214ac58
|
清楚红点提交
|
2020-11-07 17:23:10 +08:00 |
jiaoyangna
|
bc097708e9
|
不满足进阶条件,显示红点
|
2020-11-07 16:41:25 +08:00 |
jiaoyangna
|
e2b29242c7
|
有孙悟空皮肤,东华帝君皮肤点不到获取途径
|
2020-11-07 15:52:20 +08:00 |
jiaoyangna
|
f2f288c682
|
进阶页签属性图标显示错误
|
2020-11-07 15:44:53 +08:00 |
jiaoyangna
|
04fac7f216
|
魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗
|
2020-11-07 15:39:01 +08:00 |
jiaoyangna
|
ef4c4fccba
|
power change update
|
2020-11-14 14:31:38 +08:00 |
jiaoyangna
|
c639ea1c6b
|
delete log
|
2020-11-14 14:16:41 +08:00 |
jiaoyangna
|
069d42baca
|
皮肤到期刷新
|
2020-11-14 14:16:10 +08:00 |
zhangqiang
|
68979d577e
|
【神将觉醒】 觉醒成功界面
|
2020-11-07 15:15:49 +08:00 |
jiaoyangna
|
351785e3fc
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-06 21:11:18 +08:00 |
jiaoyangna
|
3a481d6d5f
|
[皮肤]修改提交
|
2020-11-06 21:05:39 +08:00 |
jiaoyangna
|
0a772f466b
|
皮肤提交
|
2020-11-06 20:36:38 +08:00 |
gaoxin
|
53b6f4483f
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-11-06 19:56:52 +08:00 |
gaoxin
|
3baf785576
|
【角色信息】修复角色信息界面滑动立绘报错的问题
|
2020-11-06 16:54:38 +08:00 |
jiaoyangna
|
cd99dd509b
|
立绘加载错误修改
|
2020-11-06 16:37:52 +08:00 |