jiaoyangna
|
73283bd818
|
回退修改提交
|
2021-12-16 10:09:48 +08:00 |
wangzhenxing
|
b46519d9c8
|
【战斗】=======反伤盾类型修改
|
2021-12-15 18:06:48 +08:00 |
wangzhenxing
|
020d8b1b05
|
[功能]=======战斗统计死亡单位置灰
|
2021-12-15 15:07:20 +08:00 |
jiaoyangna
|
c6eb719fa6
|
添加回退消耗数量
|
2021-12-15 14:41:04 +08:00 |
ZhangBiao
|
0b190666d5
|
【商城界面】提交
|
2021-12-15 14:34:21 +08:00 |
jiaoyangna
|
568ad92a9b
|
回退修改
|
2021-12-15 14:28:36 +08:00 |
jiaoyangna
|
c5448299c0
|
报错修改提交
|
2021-12-15 13:35:44 +08:00 |
jiaoyangna
|
4dc37c659c
|
回退修改提交
|
2021-12-15 10:58:49 +08:00 |
wangzhenxing
|
9f2a977b07
|
[功能]=========战斗统计界面添加死亡置灰
|
2021-12-15 09:44:35 +08:00 |
gaoxin
|
8d644dd080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-25 07:58:52 +08:00 |
gaoxin
|
973eee4b30
|
【物品】添加新物品类型
|
2021-12-25 07:58:30 +08:00 |
gaoxin
|
f22aa9fe80
|
【战斗】v1.0.74 1、修复RoleManager table.removebyvalue方法空报错
|
2021-12-25 07:57:10 +08:00 |
gaoxin
|
d14c0fe589
|
【ID1010850】首充豪礼100元档去除
|
2021-12-24 17:49:17 +08:00 |
ZhangBiao
|
b07f3ce2d5
|
【商城界面】提交
|
2021-12-14 19:16:30 +08:00 |
jiaoyangna
|
7e85eeaa90
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:57:21 +08:00 |
ZhangBiao
|
56aad6a959
|
【命格】提交
|
2021-12-14 17:52:15 +08:00 |
jiaoyangna
|
89a034a85e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-14 17:26:02 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
181e5dcb63
|
【命格】背包页签位置
|
2021-12-14 17:19:22 +08:00 |
ZhangBiao
|
e1a9459101
|
【命格】提交
|
2021-12-14 16:17:49 +08:00 |
ZhangBiao
|
bf46f1a6f6
|
【命格】提交
|
2021-12-14 15:55:47 +08:00 |
ZhangBiao
|
98308fe892
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-14 15:32:05 +08:00 |
ZhangBiao
|
85dfd5c299
|
【命格】提交
|
2021-12-14 15:31:30 +08:00 |
ZhangBiao
|
ad71840333
|
【GM】增加删除操作
|
2021-12-14 15:01:39 +08:00 |
gaoxin
|
1691fd03da
|
【战斗】优化身外化身casting显示时间
|
2021-12-14 13:51:41 +08:00 |
gaoxin
|
55f324445e
|
【月卡】修复同时激活时提示文字错误
|
2021-12-14 10:07:42 +08:00 |
ZhangBiao
|
f248583e9e
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-14 09:49:12 +08:00 |
ZhangBiao
|
13815dd2a5
|
【命格】提交
|
2021-12-14 09:48:28 +08:00 |
gaoxin
|
ab085087b0
|
【战斗】取消哪吒的技能后摇延时,可能会导致卡死
|
2021-12-13 18:56:49 +08:00 |
gaoxin
|
3d19df7cb2
|
【关卡新条件】卸下再穿戴装备后关卡界面卡死
|
2021-12-13 18:43:27 +08:00 |
ZhangBiao
|
0b5c84931a
|
【命格】提交
|
2021-12-13 18:25:35 +08:00 |
jiaoyangna
|
386e56aec0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 17:44:29 +08:00 |
jiaoyangna
|
b4e7faa04c
|
文字修改
|
2021-12-13 17:44:14 +08:00 |
ZhangBiao
|
1f249735a3
|
【命格】提交
|
2021-12-13 17:38:13 +08:00 |
wangzhenxing
|
221f5cb13e
|
【战斗】=====被动99 372 211 188被动添加空判断
|
2021-12-13 17:36:46 +08:00 |
ZhangBiao
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |
wangzhenxing
|
3ede6d5973
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 17:19:34 +08:00 |
wangzhenxing
|
759de1e7ec
|
[战斗]======主角技能释放添加排序
|
2021-12-13 17:19:02 +08:00 |
gaoxin
|
c680ea0940
|
【战斗跳过】跳过限制只对关卡战斗生效
|
2021-12-13 17:17:51 +08:00 |
gaoxin
|
ec916ef6f0
|
【引导战斗】修复casting层级错误,修复男女角色显示错误
|
2021-12-13 17:07:31 +08:00 |
gaoxin
|
494181e06c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 16:25:15 +08:00 |
gaoxin
|
064505813a
|
【战斗】修复战斗结束后立刻再进入战斗会报错卡死
|
2021-12-13 16:25:09 +08:00 |
jiaoyangna
|
0b58f64ff2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 16:21:05 +08:00 |
jiaoyangna
|
52ad37eee0
|
【ID1019400】
【月卡】购买招募秘宝后不弹出激活月卡提示,领取招募秘宝奖励时才弹出,并且提示不正确
|
2021-12-13 16:20:48 +08:00 |
gaoxin
|
b5750526b2
|
【月卡】修复月卡提示显示错误
|
2021-12-13 16:07:51 +08:00 |
jiaoyangna
|
b31036ccc5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 15:52:00 +08:00 |
jiaoyangna
|
a1f6ac1362
|
【招募秘宝】领取完奖励后,重登,中高级奖励显示可领取
|
2021-12-13 15:51:40 +08:00 |
gaoxin
|
7cdc1ff38a
|
Merge branch '0功能/关卡新条件' into china/dev
|
2021-12-13 15:49:25 +08:00 |
gaoxin
|
f920d4807c
|
【无用log删除】
|
2021-12-13 15:49:02 +08:00 |
gaoxin
|
c46d18eb17
|
【关卡新条件】好感度等级获取方式修改,逍遥游完成次数协议添加
|
2021-12-13 15:48:26 +08:00 |
gaoxin
|
ceb5f6232e
|
【剧情】战斗剧情结束回调事件
|
2021-12-13 15:27:45 +08:00 |
gaoxin
|
6c259fbf26
|
【关卡新条件】完善
|
2021-12-13 15:27:17 +08:00 |
gaoxin
|
4a9c197563
|
Merge branch 'china/dev' into 0功能/关卡新条件
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua
|
2021-12-13 15:23:27 +08:00 |
jiaoyangna
|
5f926ebbce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 15:14:03 +08:00 |
jiaoyangna
|
244aa76319
|
【ID1019396】
【招募秘宝】激活秘宝后没有获得980妖晶
|
2021-12-13 15:13:31 +08:00 |
wangzhenxing
|
95f22a2be6
|
[战斗]======盾buff去除log
|
2021-12-13 15:09:57 +08:00 |
wangzhenxing
|
23467d0ff6
|
[战斗]=====变身卡复活机制提交
|
2021-12-13 14:52:57 +08:00 |
jiaoyangna
|
1660b65c71
|
竞技试炼资源提交
|
2021-12-13 14:17:07 +08:00 |
jiaoyangna
|
bb1e41633a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 13:46:55 +08:00 |
jiaoyangna
|
53e04ac0d0
|
红点修改提交
|
2021-12-13 13:46:40 +08:00 |
ZhangBiao
|
6f06f68636
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-13 12:15:04 +08:00 |
ZhangBiao
|
ab5b654b73
|
【法宝聚灵】增加特效
|
2021-12-13 12:14:46 +08:00 |
wangzhenxing
|
52937f3a67
|
[战斗]======效果133修改,治疗接口添加容错
|
2021-12-13 11:50:50 +08:00 |
ZhangBiao
|
6e92bbd082
|
【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失
|
2021-12-13 11:04:27 +08:00 |
ZhangBiao
|
3bc06e9b8e
|
【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题
|
2021-12-13 10:14:54 +08:00 |
ZhangBiao
|
f444315fee
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-10 18:32:41 +08:00 |
ZhangBiao
|
440c9cdb92
|
【命格】提交
|
2021-12-10 18:32:08 +08:00 |
gaoxin
|
8ba26cd8b4
|
【协议】公会副本伤害数值类型修改
|
2021-12-10 18:30:26 +08:00 |
gaoxin
|
eeda6a80c5
|
【战斗】修复主角技能卡死
|
2021-12-10 18:27:51 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
gaoxin
|
3063e8244c
|
【协议】公会副本伤害数据类型修改
|
2021-12-10 18:09:23 +08:00 |
gaoxin
|
8fa3cfd2d1
|
【月卡】修改月卡激活时的提示文字
|
2021-12-10 17:39:18 +08:00 |
gaoxin
|
3835273079
|
【关卡】条件新增
|
2021-12-10 17:37:07 +08:00 |
gaoxin
|
a8186e776c
|
【月卡】修改月卡激活时的提示文字
|
2021-12-10 17:36:04 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
gaoxin
|
d2adaaba8d
|
【特权】二倍速不再判断等级提示
|
2021-12-10 16:39:10 +08:00 |
wangzhenxing
|
307264537c
|
【战斗】======被动301 修改
|
2021-12-10 16:25:34 +08:00 |
ZhangBiao
|
4b4ae7a608
|
【命格】提交
|
2021-12-10 16:16:41 +08:00 |
jiaoyangna
|
6f34492c24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 16:09:49 +08:00 |
jiaoyangna
|
9d218ee512
|
文字颜色修改提交
|
2021-12-10 16:09:28 +08:00 |
ZhangBiao
|
d3a2fdf110
|
【命格】提交
|
2021-12-10 16:07:46 +08:00 |
ZhangBiao
|
1ae26afed2
|
【命格】跳转
|
2021-12-10 15:46:35 +08:00 |
ZhangBiao
|
a3c24ee4b7
|
【命格】提交
|
2021-12-10 15:29:03 +08:00 |
wangzhenxing
|
150e37ae78
|
[战斗]======效果144修改 护盾buff修改
|
2021-12-10 15:22:18 +08:00 |
jiaoyangna
|
ad38176660
|
报错修改提交
|
2021-12-10 15:08:17 +08:00 |
jiaoyangna
|
586305b681
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 14:58:57 +08:00 |
jiaoyangna
|
9069b2ed2c
|
招募秘宝提交
|
2021-12-10 14:58:14 +08:00 |
ZhangBiao
|
9140a632f9
|
【命格】提交
|
2021-12-10 14:57:23 +08:00 |
ZhangBiao
|
f09556242d
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 14:16:28 +08:00 |
ZhangBiao
|
982137c9b7
|
【命格】提交
|
2021-12-10 14:14:08 +08:00 |
wangzhenxing
|
cecb0ddfc7
|
【战斗】========被动405 407 409修改
|
2021-12-10 14:01:04 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
gaoxin
|
7bbfa16224
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 13:44:55 +08:00 |
gaoxin
|
c10667f77d
|
【战斗】首领关卡2回合后才可以跳过
|
2021-12-10 13:44:48 +08:00 |
jiaoyangna
|
fe0efcb631
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 13:42:27 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
gaoxin
|
ad58a58843
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-10 11:58:54 +08:00 |
gaoxin
|
9ec7d07fbb
|
【身外化身剧情】孙悟空可配置为主角
|
2021-12-10 11:58:42 +08:00 |
wangzhenxing
|
33d25289b3
|
【战斗】=======变身卡技能提交
|
2021-12-10 11:52:10 +08:00 |
ZhangBiao
|
f067ae5080
|
【命格】提交
|
2021-12-10 11:40:15 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
gaoxin
|
836d216309
|
【战斗】主角出现在战斗中时缺少动画处理
|
2021-12-10 09:57:08 +08:00 |
ZhangBiao
|
e304f2136b
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-09 20:18:21 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +08:00 |
gaoxin
|
ffe01ddf16
|
【引导战斗】添加根据主角释放技能次数显示对话的功能
|
2021-12-09 18:05:47 +08:00 |
gaoxin
|
6f3774c030
|
【云梦祈福】不再请求数据
|
2021-12-09 18:04:29 +08:00 |
wangzhenxing
|
889a49576c
|
【战斗】=======第五期神魂提交
|
2021-12-09 14:25:02 +08:00 |
ZhangBiao
|
d056b1479a
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-09 13:30:30 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
gaoxin
|
10b275ea33
|
【引导】引导类型19:切换到3倍速
|
2021-12-09 11:17:47 +08:00 |
gaoxin
|
34b02496f2
|
【战斗】二倍速,三倍速解锁条件修改,跳过条件修改
|
2021-12-09 09:46:02 +08:00 |
ZhangBiao
|
7bcc95f31f
|
【命格】提交
|
2021-12-08 18:34:56 +08:00 |
ZhangBiao
|
655021fe3f
|
【命格】战力升降显示
|
2021-12-08 18:21:28 +08:00 |
ZhangBiao
|
b52b30ab1e
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-12-08 17:30:54 +08:00 |
ZhangBiao
|
4f1e129473
|
【命格】加成预览提交
|
2021-12-08 17:27:22 +08:00 |
gaoxin
|
f846d6f17e
|
【战斗】加入三倍速
|
2021-12-08 16:39:37 +08:00 |
gaoxin
|
d64715ce01
|
【牛气冲天】页签根据数据判断显隐
|
2021-12-08 15:56:08 +08:00 |
ZhangBiao
|
ae3a2fa3e4
|
【命格】提交
|
2021-12-08 15:40:43 +08:00 |
jiaoyangna
|
49500da08e
|
添加名次显示
|
2021-12-08 14:32:18 +08:00 |
ZhangBiao
|
be16abf79a
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-08 14:18:38 +08:00 |
ZhangBiao
|
016780c7bc
|
【命格】命石替换
|
2021-12-08 14:17:18 +08:00 |
jiaoyangna
|
1136879d55
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-08 14:03:43 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
wangzhenxing
|
7277afdf9b
|
[战斗]=====被动257 不灭buff修改
|
2021-12-08 10:30:18 +08:00 |
ZhangBiao
|
1efc9fc56b
|
【命格】命石穿戴
|
2021-12-08 09:29:08 +08:00 |
wangzhenxing
|
4c92d13393
|
【战斗】======257被动修改
|
2021-12-07 21:19:14 +08:00 |
gaoxin
|
16c16dda5f
|
【战斗工具】修复无法配置皮肤技能的问题
|
2021-12-07 17:47:22 +08:00 |
ZhangBiao
|
2a68523d05
|
【命格】提交
|
2021-12-07 17:19:07 +08:00 |
gaoxin
|
666e6f51a3
|
【开服福利】最后一档奖励变更为寻仙玉,外面入口还是猴子图片
|
2021-12-07 17:10:43 +08:00 |
wangzhenxing
|
3b1ba253b5
|
[战斗]======表现修改 如果正在释放技能不会播放受击动画
|
2021-12-07 16:33:04 +08:00 |
ZhangBiao
|
a0675baeb8
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 16:28:44 +08:00 |
ZhangBiao
|
9509fc7012
|
【命格】提交
|
2021-12-07 16:27:55 +08:00 |
ZhangBiao
|
464ab967ef
|
【命格】提交
|
2021-12-07 15:57:33 +08:00 |
ZhangBiao
|
eb1a9f29e5
|
【命格】测试按钮提交
|
2021-12-07 15:40:36 +08:00 |
ZhangBiao
|
86f1620e7d
|
【连购好礼】活动时间兼容调整
|
2021-12-07 15:22:52 +08:00 |
jiaoyangna
|
9184852070
|
方寸寻宝添加音效
|
2021-12-07 14:41:09 +08:00 |
ZhangBiao
|
00f0e12f28
|
【命格】背包中显示
|
2021-12-07 14:03:02 +08:00 |
wangzhenxing
|
c9f64589d0
|
【战斗】=====被动257修改
|
2021-12-07 13:43:29 +08:00 |
wangzhenxing
|
35e42ed5f0
|
【战斗】===buff图标资源 回合变化延时修改
|
2021-12-07 13:18:52 +08:00 |
ZhangBiao
|
3ad898f8af
|
【命格】提交
|
2021-12-07 11:50:03 +08:00 |
gaoxin
|
32b5e16bea
|
【喜扑IOS】喜扑IOS包sdk无法屏蔽点击事件,不允许主动打开登录界面
|
2021-12-07 11:39:38 +08:00 |
ZhangBiao
|
8efea1f06e
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 09:17:01 +08:00 |
wangzhenxing
|
9ddd7a3ddf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 19:12:59 +08:00 |
wangzhenxing
|
2376358ced
|
【战斗】=====战斗驱动延时修改
|
2021-12-06 19:12:44 +08:00 |
ZhangBiao
|
fe99e89eb9
|
【连购礼包】顶呱深处跳转修改
|
2021-12-06 19:11:45 +08:00 |
wangzhenxing
|
ab6955ba9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 19:03:13 +08:00 |
wangzhenxing
|
6c5ac0e5de
|
[战斗]======战斗轮回转化添加延时,用于处理 伤害延时
|
2021-12-06 19:03:00 +08:00 |
ZhangBiao
|
9db47caa8e
|
【连购礼包】跳转修改
|
2021-12-06 18:59:57 +08:00 |
ZhangBiao
|
692425511c
|
【寻宝迷踪】增加珍奇宝阁入口
|
2021-12-06 18:44:33 +08:00 |
ZhangBiao
|
6a4b355e7e
|
【命格】提交
|
2021-12-06 18:37:12 +08:00 |
ZhangBiao
|
3b53332e7b
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-06 18:26:14 +08:00 |
jiaoyangna
|
38b53b6824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:57:29 +08:00 |
jiaoyangna
|
77949c23e6
|
商店背景蒙黑处理
|
2021-12-06 17:56:47 +08:00 |
ZhangBiao
|
9777eb5916
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:52:38 +08:00 |
ZhangBiao
|
c367fc88f4
|
【易经宝库】珍奇宝阁无法进入修改
|
2021-12-06 17:52:27 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
jiaoyangna
|
b35bb40ff9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 17:26:23 +08:00 |
jiaoyangna
|
84a33a2a3e
|
十连抽停留位置修改
|
2021-12-06 17:26:03 +08:00 |
wangzhenxing
|
81e42565e4
|
[战斗]======被动395修改
|
2021-12-06 17:10:55 +08:00 |
ZhangBiao
|
78e8865e95
|
【连购礼包】提交
|
2021-12-06 16:59:10 +08:00 |
ZhangBiao
|
2c1300cb2d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:39:02 +08:00 |
ZhangBiao
|
19294fab2d
|
【连购好礼】购买限购礼包,次数不减,显示问题
|
2021-12-06 16:38:51 +08:00 |
jiaoyangna
|
c83f294a67
|
跳转修改提交
|
2021-12-06 16:31:30 +08:00 |
jiaoyangna
|
6036916582
|
身外化身添加跳转
|
2021-12-06 16:22:13 +08:00 |
jiaoyangna
|
8b074afa67
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 16:04:31 +08:00 |
jiaoyangna
|
9ae56712c4
|
添加已获得标志
|
2021-12-06 16:04:01 +08:00 |
ZhangBiao
|
bf520c66f2
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-06 16:02:27 +08:00 |
wangzhenxing
|
44643920ae
|
【战斗】======被动395 400修改
|
2021-12-06 16:00:50 +08:00 |
jiaoyangna
|
da9b75ee80
|
商店添加
|
2021-12-06 15:53:01 +08:00 |
jiaoyangna
|
a0440fa3ae
|
变身卡自选箱修改
|
2021-12-06 15:45:11 +08:00 |
jiaoyangna
|
2a3a22a997
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 15:43:24 +08:00 |
jiaoyangna
|
709f125845
|
商店修改
|
2021-12-06 15:43:05 +08:00 |
ZhangBiao
|
50d2066481
|
【零售特惠】跳转错误修改
|
2021-12-06 15:37:53 +08:00 |
ZhangBiao
|
022a3ee307
|
【命格】提交
|
2021-12-06 15:31:29 +08:00 |
ZhangBiao
|
b88b0d9dce
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-06 15:07:58 +08:00 |
ZhangBiao
|
10ad308033
|
【命格】提交
|
2021-12-06 15:07:34 +08:00 |
jiaoyangna
|
c78b9d4e27
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 14:51:31 +08:00 |
jiaoyangna
|
fefd3a7fd5
|
变身卡修改提交
|
2021-12-06 14:51:13 +08:00 |
ZhangBiao
|
9aef11c828
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-06 14:41:44 +08:00 |
wangzhenxing
|
292df63308
|
【战斗】=======被动 187 276修改
|
2021-12-06 14:34:23 +08:00 |
ZhangBiao
|
c8f664b93d
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-06 14:24:56 +08:00 |
ZhangBiao
|
23be95a314
|
【命格】提交
|
2021-12-06 14:24:24 +08:00 |
ZhangBiao
|
06d532a9bc
|
【命格】开坑
|
2021-12-06 14:06:23 +08:00 |
jiaoyangna
|
88c10d8031
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 14:06:01 +08:00 |
jiaoyangna
|
ab722baa35
|
变身卡修改提交
|
2021-12-06 14:05:43 +08:00 |
wangzhenxing
|
acc1be3885
|
【战斗】=====buff图标显示销毁修改
|
2021-12-06 13:18:50 +08:00 |
ZhangBiao
|
b433178b6e
|
【修行】结构更改
|
2021-12-06 11:57:08 +08:00 |
ZhangBiao
|
4434f9b615
|
【连购礼包】
|
2021-12-06 11:38:52 +08:00 |
ZhangBiao
|
3046512f77
|
【连购礼包】提交
|
2021-12-06 11:30:46 +08:00 |
ZhangBiao
|
981baa0fed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 11:23:42 +08:00 |
ZhangBiao
|
d5bd38be25
|
【连购礼包】提交
|
2021-12-06 11:23:31 +08:00 |
jiaoyangna
|
bc886f8bf3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 11:11:36 +08:00 |
jiaoyangna
|
0ca366cdf4
|
添加加号提交
|
2021-12-06 11:11:16 +08:00 |
ZhangBiao
|
1287c8f37c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 11:02:29 +08:00 |
ZhangBiao
|
7a43c51a48
|
【连购礼包】每日特惠修改
|
2021-12-06 11:02:15 +08:00 |
jiaoyangna
|
262f42a11b
|
文字修改提交
|
2021-12-06 10:26:43 +08:00 |
jiaoyangna
|
7e1cac4cbe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 09:58:25 +08:00 |
jiaoyangna
|
6309159f77
|
方寸寻宝修改提交
|
2021-12-06 09:58:04 +08:00 |
wangzhenxing
|
e9f9010c12
|
【战斗】======被动401修改
|
2021-12-06 09:40:51 +08:00 |
wangzhenxing
|
010d68819f
|
[战斗]=====buff显示id修改
|
2021-12-03 18:53:48 +08:00 |
wangzhenxing
|
2f7e5421a8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 18:20:06 +08:00 |
wangzhenxing
|
40e639098b
|
[战斗]======仙音环绕修改
|
2021-12-03 18:19:29 +08:00 |
jiaoyangna
|
b19801639d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 18:03:53 +08:00 |
jiaoyangna
|
660bbdf997
|
方寸寻宝修改提交
|
2021-12-03 18:03:36 +08:00 |
wangzhenxing
|
b9763ad25e
|
【战斗】=====变身卡提交
|
2021-12-03 17:17:47 +08:00 |
ZhangBiao
|
7348534847
|
【去除多余活动信息】
|
2021-12-03 16:46:40 +08:00 |
ZhangBiao
|
f3f74c5ff1
|
【跨服战红点】灵脉被打跨服战没红点
|
2021-12-03 16:09:33 +08:00 |
ZhangBiao
|
bf7dd87000
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
|
2021-12-03 13:25:40 +08:00 |
ZhangBiao
|
8e7afd757d
|
【连购礼包】提交
|
2021-12-03 13:21:15 +08:00 |
wangzhenxing
|
94fd5fb5cf
|
【战斗】=======被动130修改
|
2021-12-03 10:27:41 +08:00 |
ZhangBiao
|
ed5e0f6ab1
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
|
2021-12-03 10:00:31 +08:00 |
ZhangBiao
|
4c7b379ce7
|
【灵脉秘境】1号灵脉的灵气数值超框
|
2021-12-02 19:49:49 +08:00 |
ZhangBiao
|
ebff38ffc4
|
【连购礼包】提交
|
2021-12-02 19:36:28 +08:00 |
wangzhenxing
|
d424af4e4e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-02 17:43:00 +08:00 |
wangzhenxing
|
bbef7796ca
|
[战斗]=======第四期神魂
|
2021-12-02 17:42:31 +08:00 |
ZhangBiao
|
55f2e6e783
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-12-02 17:16:00 +08:00 |
ZhangBiao
|
4d1799a124
|
【连购礼包】提交
|
2021-12-02 17:13:33 +08:00 |
ZhangBiao
|
bc69e64b81
|
【连购礼包】提交
|
2021-12-02 16:27:24 +08:00 |
jiaoyangna
|
43d40d90e1
|
【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
|
2021-12-02 15:55:08 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
ZhangBiao
|
cf971541e1
|
【大闹天宫】无法挑战修改
|
2021-12-02 10:35:06 +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 |
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 |
gaoxin
|
ba0680eac6
|
【战斗】皮肤朝向修改
|
2021-11-30 23:14:06 +08:00 |
wangzhenxing
|
898f3a9b99
|
[立绘朝向]=======英雄列表初始化立绘朝向修改
|
2021-11-30 22:53:49 +08:00 |
wangzhenxing
|
6b742c0788
|
[立绘朝向]======皮肤立绘朝向修改
|
2021-11-30 20:43:56 +08:00 |
ZhangBiao
|
9e83ce264d
|
【引导】升级后不弹引导修改
|
2021-11-30 15:43:02 +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 |
ZhangBiao
|
239d5bbb36
|
【log】日志调整
|
2021-11-30 11:19:28 +08:00 |
wangzhenxing
|
bdb02e9fa4
|
[战斗]=====皮肤立绘朝向修改
|
2021-11-30 11:04:25 +08:00 |
wangzhenxing
|
e1d75c6274
|
[战斗]=====增加目标筛选条件
|
2021-11-30 09:58:27 +08:00 |
jiaoyangna
|
5463dbe559
|
提示修改提交
|
2021-11-30 09:35:37 +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 |
wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
jiaoyangna
|
93eb328ddf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 16:41:34 +08:00 |
jiaoyangna
|
2e3fdd5e56
|
颜色修改提交
|
2021-11-29 16:41:04 +08:00 |
ZhangBiao
|
36dbd13c7d
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 16:37:36 +08:00 |
ZhangBiao
|
65461a4014
|
【灵兽特惠】跳转错误修改
|
2021-11-29 16:35:40 +08:00 |
jiaoyangna
|
bce0b9b9ff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 16:35:39 +08:00 |
jiaoyangna
|
ff48e4c11f
|
天地烘炉修改提交
|
2021-11-29 16:35:23 +08:00 |
wangzhenxing
|
ea7e7d31be
|
【战中表现】======身外化身表现优化
|
2021-11-29 16:19:43 +08:00 |
wangzhenxing
|
6279110ddd
|
【战斗】=========目标选择逻辑修改
|
2021-11-29 16:07:32 +08:00 |
jiaoyangna
|
9070ad04ca
|
化身属性排序修改
|
2021-11-29 14:45:23 +08:00 |
jiaoyangna
|
fbf47dbd61
|
添加天地烘炉读表设置
|
2021-11-29 14:39:43 +08:00 |
jiaoyangna
|
c71616be27
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 14:39:15 +08:00 |
jiaoyangna
|
dae57bb8ee
|
添加天地洪炉法宝碎片读表设置
|
2021-11-29 14:38:57 +08:00 |
ZhangBiao
|
b90afb39f2
|
【灵兽特惠】提交
|
2021-11-29 14:08:07 +08:00 |
ZhangBiao
|
38f70b2c8d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 13:41:02 +08:00 |
ZhangBiao
|
d39153607b
|
【灵兽特惠】倒计时修改
|
2021-11-29 13:40:53 +08:00 |
wangzhenxing
|
2c6282e883
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 13:21:52 +08:00 |
wangzhenxing
|
1eb6115bc9
|
[角色朝向]=======立绘朝向修改
|
2021-11-29 13:21:23 +08:00 |
jiaoyangna
|
d931fa07f8
|
身外化身重复修改提交
|
2021-11-29 10:14:52 +08:00 |
jiaoyangna
|
c2638629e7
|
化身两个修改提交
|
2021-11-29 09:40:41 +08:00 |
gaoxin
|
030fea312a
|
【立绘】立绘回收时,方向还原
|
2021-12-02 04:34:30 +08:00 |
gaoxin
|
b8137b0d7c
|
【点将台】尝试修复山河社稷图黑屏
|
2021-12-02 04:33:57 +08:00 |
gaoxin
|
e2c42fcdb5
|
【关卡】修复剧情关卡后按钮状态刷新不及时的问题
|
2021-12-02 04:18:13 +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 |
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 |
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
|
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 |
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 |
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 |
jiaoyangna
|
ecc3aff607
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 14:31:17 +08:00 |
jiaoyangna
|
0c6ff17ddd
|
修改提交
|
2021-11-27 14:30:51 +08:00 |
wangzhenxing
|
fd81a89c96
|
【战斗表现】========变身卡展示位置修改
|
2021-11-27 13:56:37 +08:00 |
jiaoyangna
|
767d4589c7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 13:54:56 +08:00 |
jiaoyangna
|
04987414e9
|
图片修改提交
|
2021-11-27 13:54:36 +08:00 |
wangzhenxing
|
3c22a1ef6c
|
[立绘朝向]======静态立绘朝向改回原样
|
2021-11-27 13:17:36 +08:00 |
wangzhenxing
|
c80968098c
|
【立绘朝向】=============装备界面立绘朝向
|
2021-11-27 13:01:27 +08:00 |
gaoxin
|
060a380305
|
【战斗】跳过按钮进度显示优化
|
2021-11-26 19:41:10 +08:00 |
jiaoyangna
|
83946b29f2
|
变身卡详情修改提交
|
2021-11-26 19:37:27 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
jiaoyangna
|
97c23fb3cb
|
变身卡自选箱修改提交
|
2021-11-26 18:51:56 +08:00 |
jiaoyangna
|
5bba220ad5
|
添加跳转
|
2021-11-26 18:30:08 +08:00 |
jiaoyangna
|
80fb3c9108
|
添加tips
|
2021-11-26 18:20:03 +08:00 |
jiaoyangna
|
129e2e5c56
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 18:10:18 +08:00 |
jiaoyangna
|
410fb55f66
|
天地烘炉提交
|
2021-11-26 18:10:02 +08:00 |
wangzhenxing
|
587a5cfc2e
|
[战斗]=======133 136 137效果修改
|
2021-11-26 18:05:16 +08:00 |
jiaoyangna
|
4a82bcc664
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:54:55 +08:00 |
jiaoyangna
|
1a40cfba00
|
天地烘炉提交
|
2021-11-26 17:54:35 +08:00 |
gaoxin
|
0ddf804234
|
【战斗】战斗结构调整
|
2021-11-26 17:20:28 +08:00 |
wangzhenxing
|
a6bf54daaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:08:20 +08:00 |
jiaoyangna
|
2814265ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:06:24 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +08:00 |
wangzhenxing
|
13e0ab29ba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 16:56:01 +08:00 |
wangzhenxing
|
69e30d908c
|
[立绘朝向]===============我方立绘展示朝向修改
|
2021-11-26 16:55:13 +08:00 |
ZhangBiao
|
ed45f56479
|
【主角】未到开启等级有红点
|
2021-11-26 16:44:01 +08:00 |
ZhangBiao
|
7e1039bf3b
|
【灵脉秘境】特效
|
2021-11-26 15:43:39 +08:00 |
ZhangBiao
|
5c7ba2529d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 15:15:23 +08:00 |
ZhangBiao
|
b33ee1b006
|
【灵脉秘境】特效提交
|
2021-11-26 15:15:10 +08:00 |
gaoxin
|
efe08520b9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 14:28:04 +08:00 |
gaoxin
|
a9a402bd42
|
【战斗】再次优化护盾类特效的显示层级
|
2021-11-26 14:27:58 +08:00 |
gaoxin
|
bb685191dd
|
【优化】设置物品显示的方法改为通用方法
|
2021-11-26 14:27:24 +08:00 |
gaoxin
|
62097d4d05
|
【红包】时间显示方法修改
|
2021-11-26 14:26:04 +08:00 |
jiaoyangna
|
b63b619426
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 14:11:37 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
gaoxin
|
6b199a8b5a
|
【战斗】敌方怒气穿透
|
2021-11-26 14:06:19 +08:00 |
gaoxin
|
15b3718dd8
|
【测试战斗】添加一些特效配置的参数
|
2021-11-26 13:59:18 +08:00 |
gaoxin
|
21e7638a75
|
【特效】优化点对点特效的显示时间,优化特效层级错误的问题
|
2021-11-26 13:58:59 +08:00 |
gaoxin
|
71aa002b13
|
【战斗】前置特效添加延时
|
2021-11-26 13:58:24 +08:00 |
jiaoyangna
|
c5fddcdf7a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 13:19:11 +08:00 |
jiaoyangna
|
14b54c7d5e
|
变身卡名字颜色修改
|
2021-11-26 13:18:45 +08:00 |
wangzhenxing
|
1da1d1457b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 13:08:37 +08:00 |
wangzhenxing
|
180d76f3b9
|
【战斗】========主角技能gm添加字段
|
2021-11-26 13:07:49 +08:00 |
jiaoyangna
|
838d7108bd
|
添加资源条
|
2021-11-26 13:07:45 +08:00 |
jiaoyangna
|
0d18d4595e
|
测试按钮关闭
|
2021-11-26 13:05:07 +08:00 |
jiaoyangna
|
def89bf7e3
|
身外化身提交
|
2021-11-26 12:51:52 +08:00 |
jiaoyangna
|
2212df06ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:39:24 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
964a1b4fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:34:57 +08:00 |
jiaoyangna
|
b78e2335fa
|
身外化身提交
|
2021-11-26 11:34:25 +08:00 |
wangzhenxing
|
bb1402d5e7
|
[战斗]======立绘方向修改
|
2021-11-26 11:24:46 +08:00 |
ZhangBiao
|
4c7268b11a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:09:30 +08:00 |
ZhangBiao
|
c8fa05d5a0
|
【固定活动】提交
|
2021-11-26 11:09:22 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
gaoxin
|
5557795658
|
【轩辕宝镜】偶现跨0点报错
|
2021-11-26 10:53:49 +08:00 |
gaoxin
|
f5f5a2477d
|
【战斗】怒气层级错误
|
2021-11-26 10:33:30 +08:00 |
gaoxin
|
878e8b095a
|
【森罗幻境】修复老虎机小游戏后音效播放错误
|
2021-11-26 10:29:12 +08:00 |
gaoxin
|
3a574880ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 10:19:35 +08:00 |
gaoxin
|
ad3ca2e0d2
|
【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型
|
2021-11-26 10:19:29 +08:00 |
ZhangBiao
|
f83bffaf75
|
【固定活动】提交
|
2021-11-26 10:16:46 +08:00 |
ZhangBiao
|
7f525511c8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 09:54:21 +08:00 |
ZhangBiao
|
45df1fb982
|
【寻仙招募】增加心愿阵营条
|
2021-11-26 09:54:12 +08:00 |
wangzhenxing
|
5449b2357d
|
[战斗]=====效果132修改
|
2021-11-26 09:36:41 +08:00 |
jiaoyangna
|
8a3ca0cb97
|
天地洪炉提交
|
2021-11-25 19:06:20 +08:00 |
jiaoyangna
|
34949242a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-11-25 18:57:48 +08:00 |
jiaoyangna
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +08:00 |
ZhangBiao
|
db5627ab24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 18:51:46 +08:00 |
ZhangBiao
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
wangzhenxing
|
6927b52365
|
[战斗]=======主角变身卡添加gm
|
2021-11-25 18:36:00 +08:00 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
ZhangBiao
|
d40b07138c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 16:16:48 +08:00 |
ZhangBiao
|
bd4ce88486
|
【乾坤宝盒】报错修改
|
2021-11-25 16:16:39 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
gaoxin
|
458b7b2ca5
|
【灵兽】升级时,没有战斗力变化提示
|
2021-11-25 16:03:41 +08:00 |
ZhangBiao
|
2d76df2105
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:59:42 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
gaoxin
|
879cf506f5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:43:15 +08:00 |
gaoxin
|
4923314bbb
|
【战斗】屏幕震动加入伤害延时时间
|
2021-11-25 15:43:10 +08:00 |
wangzhenxing
|
aff13f8904
|
【战斗】======技能132-140提交
|
2021-11-25 15:07:40 +08:00 |
wangzhenxing
|
b15eaf8b19
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:05:10 +08:00 |
wangzhenxing
|
ae8021cd6a
|
[战斗表现]========敌我方立绘镜像显示
|
2021-11-25 15:04:55 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
gaoxin
|
336321ebf3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 14:44:15 +08:00 |
gaoxin
|
a36714d286
|
【战斗】跳过提示文字:第二回合结束后可以跳过
|
2021-11-25 14:44:10 +08:00 |
ZhangBiao
|
1c9d113a86
|
【活动、修为】界面调整
|
2021-11-25 11:52:35 +08:00 |
ZhangBiao
|
3ffefeea3c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:03:17 +08:00 |
ZhangBiao
|
855f658a93
|
【灵兽宝阁】错误修改
|
2021-11-25 11:03:08 +08:00 |
gaoxin
|
347cc3f9ba
|
【每日豪礼】资源68->98
|
2021-11-25 10:47:02 +08:00 |
ZhangBiao
|
e4b0fd1824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 18:14:37 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
gaoxin
|
4607bd2fed
|
Merge branch '0功能/账号id校验' into china/dev
|
2021-11-24 16:03:34 +08:00 |
gaoxin
|
bb15f0056e
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:42:11 +08:00 |
gaoxin
|
d1ce54c9a9
|
【测试战斗】报错修复
|
2021-11-24 14:22:27 +08:00 |
gaoxin
|
f01889db21
|
【战斗】改为第三回合时战斗就可以跳过
|
2021-11-24 14:21:44 +08:00 |
gaoxin
|
86dff44ce7
|
【主界面按钮】兼容删除了的活动
|
2021-11-24 11:43:46 +08:00 |
ZhangBiao
|
2d25ebb61b
|
【修为】修为调整
|
2021-11-24 11:30:55 +08:00 |
ZhangBiao
|
0e15c3d812
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 10:22:51 +08:00 |
ZhangBiao
|
18648a7622
|
【云游商人】装备文字叠加、显示人名错误修改
|
2021-11-24 10:18:36 +08:00 |
jiaoyangna
|
012847047e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 07:28:50 +08:00 |
jiaoyangna
|
e947ab68b2
|
排行奖励切换奖励显示不正确修改
|
2021-11-24 07:24:17 +08:00 |
gaoxin
|
5462a1ad3b
|
【战斗】弹道特效转向
|
2021-11-23 17:23:35 +08:00 |
gaoxin
|
3f343bb1b2
|
【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过
|
2021-11-23 17:22:54 +08:00 |
wangzhenxing
|
9cce1aa31c
|
【战斗表现】======剧情特殊处理敌人名字位置
|
2021-11-23 15:13:43 +08:00 |
jiaoyangna
|
86bf793ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-23 14:01:00 +08:00 |
jiaoyangna
|
735b2dc404
|
法宝之灵展示修改
|
2021-11-23 14:00:36 +08:00 |
wangzhenxing
|
b8b1c74f03
|
[战斗]========被动391修改 我方流血显示修改
|
2021-11-23 10:46:52 +08:00 |
jiaoyangna
|
e88f1f7b01
|
【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
|
2021-11-23 10:31:09 +08:00 |
ZhangBiao
|
6cd26e96af
|
【灵脉秘境】纪录换行问题修改
|
2021-11-22 19:11:07 +08:00 |
ZhangBiao
|
fbb58dbfdc
|
【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名
|
2021-11-22 18:44:32 +08:00 |
ZhangBiao
|
bdc85fea41
|
【灵脉秘境】红点修改
|
2021-11-22 18:08:48 +08:00 |
ZhangBiao
|
ba1201dd7a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:59:55 +08:00 |
ZhangBiao
|
d06d3c6e2f
|
【灵脉秘境】红点判断
|
2021-11-22 17:59:46 +08:00 |
gaoxin
|
95382d530e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:37:38 +08:00 |
gaoxin
|
487c0d327a
|
【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印
|
2021-11-22 17:37:26 +08:00 |
wangzhenxing
|
d9120676f7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:22:50 +08:00 |
wangzhenxing
|
134b1aff71
|
【战斗表现】============我方复活后血条不显示修改
|
2021-11-22 17:21:59 +08:00 |
ZhangBiao
|
232e965dbc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:20:12 +08:00 |
ZhangBiao
|
f4febd8ed8
|
【灵脉秘境】竞技场pvp切磋报错修改
|
2021-11-22 17:20:04 +08:00 |
wangzhenxing
|
f67006e041
|
【战斗】============战斗超时pvp类型检测添加类型
|
2021-11-22 16:57:46 +08:00 |
ZhangBiao
|
9fe1e610ca
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:52:29 +08:00 |
ZhangBiao
|
d688ae8ab9
|
【灵脉秘境】排行错误提交
|
2021-11-22 16:52:21 +08:00 |
gaoxin
|
66670029dc
|
【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题
|
2021-11-22 16:42:14 +08:00 |
jiaoyangna
|
21fa0c1762
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:38:43 +08:00 |
jiaoyangna
|
083d33b237
|
【ID1019215】
【坐骑合成】坐骑合成时拖动进度条可以把当前合成数量变成0,点击加号提示神将已达上限
|
2021-11-22 16:38:24 +08:00 |
wangzhenxing
|
3ec9fd80fd
|
[战斗]======被动360 伤害公式修改只有神将才计算阵营伤害增减
|
2021-11-22 16:34:57 +08:00 |
gaoxin
|
7f68c39f91
|
【灵脉】回放跳过时战斗卡住
|
2021-11-22 16:28:36 +08:00 |
gaoxin
|
f81914dfaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:13:30 +08:00 |
gaoxin
|
d52ca13ff6
|
【战斗】关闭战斗类型打印
|
2021-11-22 16:13:06 +08:00 |
ZhangBiao
|
425d4934b8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:11:29 +08:00 |
ZhangBiao
|
ab4faba301
|
【灵脉秘境】主动攻击不会产生红点
|
2021-11-22 16:11:21 +08:00 |
gaoxin
|
e800f29b33
|
【竞技场】查看玩家信息报错
|
2021-11-22 16:06:52 +08:00 |
jiaoyangna
|
7722ede726
|
属性修改提交
|
2021-11-22 15:55:02 +08:00 |
jiaoyangna
|
5e8f8c59a1
|
添加底图
|
2021-11-22 15:48:54 +08:00 |
jiaoyangna
|
ed5cd6ec59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:25:53 +08:00 |
jiaoyangna
|
9d2023c182
|
法宝之灵提交
|
2021-11-22 15:25:26 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
jiaoyangna
|
9abd87c14b
|
战力添加
|
2021-11-22 15:06:44 +08:00 |
jiaoyangna
|
8bb17fa29c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:03:03 +08:00 |
jiaoyangna
|
da218cfc3c
|
添加战力
|
2021-11-22 15:02:42 +08:00 |
ZhangBiao
|
99c4b8f81d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:00:54 +08:00 |
ZhangBiao
|
2428034e9d
|
【GM】增加一键法宝碎片
|
2021-11-22 15:00:46 +08:00 |
jiaoyangna
|
7647b0057e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:15:55 +08:00 |
ZhangBiao
|
025edbcacf
|
【灵脉秘境】界面修改、红点修改
|
2021-11-22 14:13:49 +08:00 |
jiaoyangna
|
d239f69a98
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:12:08 +08:00 |
jiaoyangna
|
197b6f0d45
|
滑动修改提交
|
2021-11-22 14:10:54 +08:00 |
gaoxin
|
f22f47202a
|
【太初密卷】获取网络图片错误时,无法进入游戏
|
2021-11-22 14:06:23 +08:00 |
gaoxin
|
c33963f0b6
|
【点将台】修复新增心愿神将提示只在引导时显示的问题
|
2021-11-22 13:37:58 +08:00 |
gaoxin
|
290911903c
|
【法宝聚灵】修复开启宝箱获取时不显示数字
|
2021-11-22 13:37:12 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |
ZhangBiao
|
cb80384f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 12:11:41 +08:00 |