gaoxin
|
eaea265bc7
|
【物品】添加物品使用的限制等级
|
2021-12-26 17:35:50 +08:00 |
jiaoyangna
|
19a1e1b7ca
|
超值返利提交
|
2021-12-16 18:41:30 +08:00 |
jiaoyangna
|
c1f0e0f78b
|
添加选中框
|
2021-12-16 18:38:32 +08:00 |
ZhangBiao
|
b203711459
|
Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-16 17:17:16 +08:00 |
gaoxin
|
cb8f8fe0aa
|
【挂机物品】添加时间标签
|
2021-12-26 17:13:30 +08:00 |
ZhangBiao
|
3a96f7cf4e
|
【商城界面】提交
|
2021-12-16 17:16:18 +08:00 |
ZhangBiao
|
c915a3b9eb
|
【协议】提交
|
2021-12-16 17:00:47 +08:00 |
ZhangBiao
|
68d6e39882
|
【协议】提交
|
2021-12-16 16:58:20 +08:00 |
jiaoyangna
|
50927b9ac5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 16:55:46 +08:00 |
jiaoyangna
|
1ae167efb5
|
至尊降世修改提交
|
2021-12-16 16:55:30 +08:00 |
wangzhenxing
|
25bc46e049
|
[战斗]======被动197 技能126 147修改
|
2021-12-16 16:13:01 +08:00 |
gaoxin
|
969a22a768
|
【引导】修改引导天书密卷时主城场景的位置
|
2021-12-26 15:08:51 +08:00 |
ZhangBiao
|
ae3f0c5df2
|
【连续礼包】新增连续礼包入口
|
2021-12-16 14:20:04 +08:00 |
gaoxin
|
7bf43f37f5
|
【挂机奖励】使用界面文字修改
|
2021-12-26 11:21:17 +08:00 |
ZhangBiao
|
abb068e9cb
|
【商城界面】提交
|
2021-12-16 13:11:07 +08:00 |
ZhangBiao
|
e9954f49f2
|
【商城界面】提交
|
2021-12-16 11:59:18 +08:00 |
jiaoyangna
|
b811bd0d24
|
超值返利预设代码提交
|
2021-12-16 11:45:51 +08:00 |
jiaoyangna
|
a40a8a67d4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 11:42:37 +08:00 |
jiaoyangna
|
e2a1f147ae
|
活动修改提交
|
2021-12-16 11:42:20 +08:00 |
jiaoyangna
|
11c4f914b5
|
至尊降世提交
|
2021-12-16 11:42:00 +08:00 |
ZhangBiao
|
2858f2e400
|
【商城界面】提交
|
2021-12-16 10:46:11 +08:00 |
wangzhenxing
|
d9f1670993
|
【战斗】====战斗gm报错修改
|
2021-12-16 10:24:36 +08:00 |
jiaoyangna
|
7c1a3caa5f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 10:10:05 +08:00 |
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
|
eeda6a80c5
|
【战斗】修复主角技能卡死
|
2021-12-10 18:27:51 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +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
|
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 |