ZhangBiao
|
f1e5f69614
|
【御剑行】提交
|
2021-10-09 14:33:09 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
09bb4fc688
|
【御剑行】可以读取剧本移动了
|
2021-10-09 10:56:49 +08:00 |
jiaoyangna
|
845373e12d
|
好感度长按修改提交
|
2021-10-09 10:53:32 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
jiaoyangna
|
c72d3af853
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:32:16 +08:00 |
jiaoyangna
|
937096d445
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:17:59 +08:00 |
jiaoyangna
|
7b88415339
|
好感度优化提交
|
2021-10-08 18:53:06 +08:00 |
ZhangBiao
|
81a3db0446
|
【御剑行】提交
|
2021-10-08 15:45:28 +08:00 |
jiaoyangna
|
6700723aaa
|
好感度0级挂机收益显示错误修改
|
2021-10-08 14:31:28 +08:00 |
jiaoyangna
|
ce39857111
|
杨戬新资源修改提交
|
2021-10-08 14:18:31 +08:00 |
jiaoyangna
|
8d91a6d875
|
协议提交
|
2021-10-08 13:09:13 +08:00 |
jiaoyangna
|
491c04b2a3
|
装备套装属性预设修改提交
|
2021-10-08 12:14:48 +08:00 |
jiaoyangna
|
14008964fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:55:25 +08:00 |
jiaoyangna
|
f449016952
|
添加容错
|
2021-10-08 11:55:01 +08:00 |
ZhangBiao
|
878f0410ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:54:09 +08:00 |
ZhangBiao
|
eb816dcc89
|
【七界试炼】修复无法取消激活
|
2021-10-08 11:53:54 +08:00 |
jiaoyangna
|
e019ef8f22
|
【ID1010392】
点石成金基础收益随着玩家等级提升
|
2021-10-08 11:51:37 +08:00 |
jiaoyangna
|
8de35750c6
|
【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
|
2021-10-08 11:34:48 +08:00 |
gaoxin
|
2dbb544a46
|
【登录】登录接口编号增加
|
2021-09-30 15:19:10 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +08:00 |
jiaoyangna
|
6ebea4784d
|
好感度报错修改
|
2021-09-30 11:37:24 +08:00 |
jiaoyangna
|
cb9384efd7
|
【ID1018672】
【文字颜色不清晰】粉色心中间数字换种字体颜色
(cherry picked from commit ffde7813a0 )
|
2021-09-30 11:03:14 +08:00 |
jiaoyangna
|
7b57e44279
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-30 11:01:11 +08:00 |
jiaoyangna
|
115e067efb
|
好感度漏提
|
2021-09-30 11:00:58 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
JLIOSM1
|
13f9e653ae
|
【称号】罗浮之主称号显示错误
|
2021-09-29 20:41:19 +08:00 |
ZhangBiao
|
660a88b965
|
【御剑行】提交
|
2021-09-29 18:34:54 +08:00 |
jiaoyangna
|
b88bfef04f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 18:23:26 +08:00 |
jiaoyangna
|
b44c4af217
|
好感度0点次数刷新修改
|
2021-09-29 18:23:13 +08:00 |
gaoxin
|
73709000a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 17:34:38 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
jiaoyangna
|
de2aa940b4
|
七界试炼预设调整
|
2021-09-29 16:55:56 +08:00 |
jiaoyangna
|
8abe248a24
|
逍遥游奖励界面修改提交
|
2021-09-29 16:21:24 +08:00 |
jiaoyangna
|
4dfdc507f7
|
绿色修改提交
|
2021-09-29 16:19:29 +08:00 |
jiaoyangna
|
a62e656d7b
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-29 15:49:39 +08:00 |
gaoxin
|
0abe5663c6
|
【战斗力】debug时不再计算老版本的战斗力
|
2021-09-29 14:55:14 +08:00 |
jiaoyangna
|
ee096187ad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 14:35:15 +08:00 |
jiaoyangna
|
f2273e427c
|
逍遥游改表代码修改提交
|
2021-09-29 14:34:59 +08:00 |
gaoxin
|
2352144ead
|
【四灵试炼】助战神将报错
|
2021-09-29 09:19:53 +08:00 |
gaoxin
|
b1dff6a023
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:33:09 +08:00 |
gaoxin
|
8692e6cec9
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:32:40 +08:00 |
gaoxin
|
788d18e332
|
【装备对比】背包中的装备信息界面修改
|
2021-09-28 21:00:50 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +08:00 |
gaoxin
|
eb452a1c69
|
【图片压缩工具】
|
2021-09-28 19:44:39 +08:00 |
gaoxin
|
37381da67e
|
【特效】修复特效贴图过大的问题
|
2021-09-28 19:35:46 +08:00 |
jiaoyangna
|
c242b86dd2
|
好感度详情提交
|
2021-09-28 18:23:37 +08:00 |
jiaoyangna
|
5d3871ef17
|
玲珑宝镜进度条颜色修改提交
|
2021-09-28 17:49:52 +08:00 |
ZhangBiao
|
fa1c5a5dee
|
【御剑行】提交
|
2021-09-28 17:48:28 +08:00 |