jiaoyangna
|
17c6d0cdc7
|
地图小人挺住不动修改
|
2021-12-31 14:07:56 +08:00 |
wangzhenxing
|
2f2634eb39
|
【飞升】=====代码预设提交
|
2021-12-31 13:50:49 +08:00 |
jiaoyangna
|
a35ad65ea3
|
添加容错
|
2021-12-31 13:49:48 +08:00 |
ZhangBiao
|
cf9cbc5ac9
|
【家园】摘星阁装备属性加持+战斗力
|
2021-12-31 13:44:11 +08:00 |
jiaoyangna
|
7a9d61e8c9
|
地图探索修改提交
|
2021-12-31 11:40:42 +08:00 |
jiaoyangna
|
e6061c0762
|
一键上阵修改提交
|
2021-12-31 11:18:20 +08:00 |
ZhangBiao
|
bd2d5ccd50
|
【家园】提交
|
2021-12-30 20:24:59 +08:00 |
ZhangBiao
|
85319e89f0
|
【家园】提交
|
2021-12-30 20:09:16 +08:00 |
ZhangBiao
|
8de1e4e596
|
【家园】资源提交
|
2021-12-30 19:02:52 +08:00 |
jiaoyangna
|
57b0689de6
|
【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
|
2021-12-30 18:06:36 +08:00 |
jiaoyangna
|
5ab9c8d915
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
|
2021-12-30 16:47:19 +08:00 |
ZhangBiao
|
fc9377b8e9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-30 16:29:54 +08:00 |
ZhangBiao
|
5672203920
|
【云游商人】优化
|
2021-12-30 16:29:37 +08:00 |
wangzhenxing
|
c318dea91a
|
【战前属性】====战前属性增加新类型 413计算
|
2021-12-30 16:22:44 +08:00 |
gaoxin
|
4c0a3a3864
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-02 02:48:25 +08:00 |
gaoxin
|
f4e149e898
|
【邮件】有附件时添加分割线
|
2022-01-02 02:48:03 +08:00 |
ZhangBiao
|
f500bc9ed1
|
【云游商人】更改索引方式
|
2021-12-30 15:51:12 +08:00 |
jiaoyangna
|
5d8b9ffea4
|
修行等级显示提交
|
2021-12-30 15:13:24 +08:00 |
jiaoyangna
|
973e19ac66
|
超值返利修改提交
|
2021-12-30 15:05:21 +08:00 |
jiaoyangna
|
3ad7485c1c
|
地图修改提交
|
2021-12-30 15:01:00 +08:00 |
jiaoyangna
|
dc4a07c6da
|
名字修改提交
|
2021-12-30 14:57:24 +08:00 |
jiaoyangna
|
185eb85640
|
超值返利修改提交
|
2021-12-30 14:45:54 +08:00 |
jiaoyangna
|
84e7aa2ae2
|
超值返利修改提交
|
2021-12-30 14:45:23 +08:00 |
wangzhenxing
|
270e359507
|
[玉虚论道]=====对战界面添加音效
|
2021-12-30 14:41:43 +08:00 |
jiaoyangna
|
b118d30185
|
添加修行等级
|
2021-12-30 14:38:06 +08:00 |
jiaoyangna
|
d4d1653bc2
|
探索优化
|
2021-12-30 14:01:30 +08:00 |
jiaoyangna
|
80263f61f0
|
探索优化提交
|
2021-12-30 13:50:39 +08:00 |
jiaoyangna
|
4b6de5c984
|
探索优化提交
|
2021-12-30 13:27:57 +08:00 |
jiaoyangna
|
9a0ec7feee
|
添加切换效果
|
2021-12-30 11:55:15 +08:00 |
ZhangBiao
|
0f32a05956
|
【装备界面】增加摘星阁加持
|
2021-12-30 11:49:12 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
jiaoyangna
|
2a14bc799f
|
探索中优化
|
2021-12-30 11:41:13 +08:00 |
ZhangBiao
|
44aa663ab0
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-30 11:24:38 +08:00 |
ZhangBiao
|
f148668636
|
【家园】提交
|
2021-12-30 11:00:27 +08:00 |
ZhangBiao
|
630d56c810
|
【家园】装备强化升级
|
2021-12-29 20:17:45 +08:00 |
wangzhenxing
|
db071514f9
|
【战斗】======被动283修改
|
2021-12-29 17:59:48 +08:00 |
jiaoyangna
|
b46a62c25a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-29 17:11:09 +08:00 |
jiaoyangna
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
wangzhenxing
|
d158a9451a
|
[战斗]=======被动414 修改
|
2021-12-29 17:09:27 +08:00 |
jiaoyangna
|
657574b61a
|
探索地图修改提交
|
2021-12-29 16:21:59 +08:00 |
jiaoyangna
|
89c298f593
|
探索地图修改提交
|
2021-12-29 16:05:16 +08:00 |
jiaoyangna
|
4318b37891
|
探索中修改提交
|
2021-12-29 14:53:45 +08:00 |
jiaoyangna
|
d91afe4326
|
探索
|
2021-12-29 14:35:11 +08:00 |
jiaoyangna
|
73eebe80e0
|
探索提交
|
2021-12-29 14:33:19 +08:00 |
jiaoyangna
|
32cc5de541
|
探索提交
|
2021-12-29 14:30:02 +08:00 |
jiaoyangna
|
4e4ebd563c
|
探索提交
|
2021-12-29 14:24:44 +08:00 |
ZhangBiao
|
a1301a4a22
|
【家园】任务
|
2021-12-29 14:03:16 +08:00 |
jiaoyangna
|
a6652757b1
|
探索提交
|
2021-12-29 13:29:21 +08:00 |
wangzhenxing
|
33f1934d02
|
【战斗】========角色皮肤释放技能表现修改
|
2021-12-29 13:08:32 +08:00 |
gaoxin
|
07dec9a6d5
|
【每日签到】分帧加载
|
2021-12-31 03:01:26 +08:00 |
gaoxin
|
d16833005a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-31 01:45:20 +08:00 |
gaoxin
|
17394f79a0
|
【动画】神将切换动画优化
|
2021-12-31 01:45:13 +08:00 |
gaoxin
|
52229c0d94
|
【邮件】内容显示自适应
|
2021-12-31 00:24:37 +08:00 |
jiaoyangna
|
5c51490cf5
|
探索提交
|
2021-12-29 10:33:12 +08:00 |
jiaoyangna
|
dac88a6dbf
|
探索提交
|
2021-12-29 10:02:22 +08:00 |
ZhangBiao
|
197b28b3da
|
【家园】加速确认
|
2021-12-28 18:27:31 +08:00 |
jiaoyangna
|
d06a5e6471
|
探索提交
|
2021-12-28 18:16:28 +08:00 |
jiaoyangna
|
978689d9a7
|
探索提交
|
2021-12-28 17:52:28 +08:00 |
wangzhenxing
|
73d92664de
|
[飞升]=======飞升逻辑提交
|
2021-12-28 16:20:07 +08:00 |
jiaoyangna
|
5e75e2384e
|
探索提交
|
2021-12-28 15:31:46 +08:00 |
jiaoyangna
|
b40bd10a32
|
主城修改提交
|
2021-12-28 15:07:42 +08:00 |
ZhangBiao
|
d81a2b7265
|
【命格】界面无法打开修改
|
2021-12-28 15:01:43 +08:00 |
jiaoyangna
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +08:00 |
jiaoyangna
|
0e0f209440
|
探索时间选择修改
|
2021-12-28 13:37:30 +08:00 |
ZhangBiao
|
69cb591edb
|
【家园】升级进度条
|
2021-12-28 13:37:04 +08:00 |
jiaoyangna
|
9dafa85858
|
探索提交
|
2021-12-28 13:30:27 +08:00 |
ZhangBiao
|
b66cfdc61d
|
【家园】提交
|
2021-12-28 11:54:08 +08:00 |
jiaoyangna
|
4a9792363d
|
协议提交
|
2021-12-27 17:13:54 +08:00 |
jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
wangzhenxing
|
380b0bdb78
|
[飞升]=============飞升代码提交
|
2021-12-27 16:39:38 +08:00 |
jiaoyangna
|
b3c0ea78ab
|
探索提交
|
2021-12-27 16:31:38 +08:00 |
jiaoyangna
|
9e47928008
|
探索提交
|
2021-12-27 16:16:56 +08:00 |
jiaoyangna
|
bef8340c7c
|
探索
|
2021-12-27 15:48:09 +08:00 |
jiaoyangna
|
71496d3905
|
探索提交
|
2021-12-27 15:42:52 +08:00 |
wangzhenxing
|
07a90b7279
|
[战斗]=========战斗记录老虎上无敌盾记录修改
|
2021-12-27 15:42:38 +08:00 |
gaoxin
|
220bfff064
|
【优化】魂印描述优化
|
2021-12-30 00:54:40 +08:00 |
jiaoyangna
|
b9a86b402c
|
探索提交
|
2021-12-27 14:53:55 +08:00 |
gaoxin
|
dc431e3f4d
|
【首充收缩框】需要每次登陆后展开,当前是打开主城时展开
|
2021-12-27 12:05:43 +08:00 |
gaoxin
|
89f8af19c4
|
【主城】竖条改为初始打开
|
2021-12-31 01:53:05 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
jiaoyangna
|
5f9f7da264
|
探索提交
|
2021-12-24 17:49:54 +08:00 |
jiaoyangna
|
577752e71d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 16:31:41 +08:00 |
jiaoyangna
|
65dbdc5283
|
【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
|
2021-12-24 16:31:25 +08:00 |
wangzhenxing
|
d3253c5edb
|
【战斗】========技能释放逻辑修改,技能播放技能攻击动作
|
2021-12-24 16:11:53 +08:00 |
wangzhenxing
|
b07d5548e6
|
[功能]========坐骑界面选中状态修改
|
2021-12-24 15:45:04 +08:00 |
wangzhenxing
|
ca17383879
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-24 14:55:22 +08:00 |
ZhangBiao
|
a28021b4f6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:47:52 +08:00 |
ZhangBiao
|
80b6315905
|
【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取
|
2021-12-24 14:47:39 +08:00 |
jiaoyangna
|
b33bd02c7f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:25:22 +08:00 |
gaoxin
|
9965f8e079
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-30 23:29:11 +08:00 |
gaoxin
|
9c22dfc990
|
【提审】不再显示充值竖条,也不再触发相关引导
|
2021-12-30 23:28:55 +08:00 |
ZhangBiao
|
fea92ffabc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:20:06 +08:00 |
jiaoyangna
|
36ec134505
|
玉帝获取途径跳转提交
|
2021-12-24 14:20:06 +08:00 |
ZhangBiao
|
99d00e88e2
|
【命格】合成界面第一次打开道具详情
|
2021-12-24 14:19:47 +08:00 |
jiaoyangna
|
21e5b0846b
|
玉帝跳转提交
|
2021-12-24 14:13:39 +08:00 |
jiaoyangna
|
88130ac4dd
|
探索提交
|
2021-12-24 14:09:48 +08:00 |
wangzhenxing
|
6e2b1c1a17
|
[战斗]=======被动56 被动368修改
|
2021-12-24 14:00:51 +08:00 |
gaoxin
|
e901bd9d3b
|
【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关
|
2021-12-30 22:37:35 +08:00 |
gaoxin
|
d10d2f976a
|
【装备合成】添加输入改变合成数量的功能
|
2021-12-30 22:19:09 +08:00 |
gaoxin
|
613380a99f
|
【装备合成】添加长按自动增加数量功能
|
2021-12-30 20:32:11 +08:00 |
jiaoyangna
|
7f0e684bc0
|
一键探索修改提交
|
2021-12-24 11:18:03 +08:00 |
jiaoyangna
|
00dc90f4bb
|
商店报错添加容错
|
2021-12-24 11:05:39 +08:00 |
jiaoyangna
|
89b5eae8ec
|
商店添加容错
|
2021-12-24 10:58:55 +08:00 |
jiaoyangna
|
e34092f93d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 10:54:16 +08:00 |
jiaoyangna
|
b1c5113c39
|
商店报错添加容错
|
2021-12-24 10:53:26 +08:00 |
jiaoyangna
|
708a4bdef9
|
探索提交
|
2021-12-24 09:37:31 +08:00 |
ZhangBiao
|
dbc3395945
|
【家园】详情
|
2021-12-24 09:33:56 +08:00 |
jiaoyangna
|
6dfafd7054
|
探索提交
|
2021-12-24 00:33:33 +08:00 |
jiaoyangna
|
130a75c8dd
|
探索提交
|
2021-12-24 00:14:32 +08:00 |
ZhangBiao
|
078c3a1f96
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 17:48:20 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
d06fdbbac6
|
【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮
|
2021-12-23 17:19:27 +08:00 |
ZhangBiao
|
7f9726e006
|
【命格】提交
|
2021-12-23 16:39:37 +08:00 |
ZhangBiao
|
926e0a4fbd
|
【命石】一键合成修改
|
2021-12-23 16:17:35 +08:00 |
wangzhenxing
|
c895652ef1
|
[战斗]======被动412 修改
|
2021-12-23 15:18:44 +08:00 |
gaoxin
|
7ea4c7bc51
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-30 00:01:21 +08:00 |
gaoxin
|
da2b205955
|
【挂机】添加新人商城入口
|
2021-12-30 00:01:14 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
wangzhenxing
|
76d9e596b4
|
[战斗]======被动412 提交
|
2021-12-23 14:37:19 +08:00 |
jiaoyangna
|
83b5a04ac6
|
探索提交
|
2021-12-23 13:45:33 +08:00 |
jiaoyangna
|
39254af42e
|
探索提交
|
2021-12-23 13:45:05 +08:00 |
jiaoyangna
|
7bb3325c99
|
探索提交
|
2021-12-23 13:09:34 +08:00 |
gaoxin
|
cf87db6577
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-23 11:05:25 +08:00 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +08:00 |
gaoxin
|
b74274b75a
|
【引导】添加战斗失败触发类型38, 添加引导进入假战斗类型20
|
2021-12-22 18:25:36 +08:00 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +08:00 |
gaoxin
|
39495bee28
|
【至尊降世】修复老活动跳转报错
|
2021-12-21 21:03:42 +08:00 |
gaoxin
|
9a1350e8d3
|
【超值基金】语法错误
|
2021-12-21 18:27:15 +08:00 |
ZhangBiao
|
e111740975
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-21 18:13:13 +08:00 |
ZhangBiao
|
d2efbd920c
|
【家园】提交
|
2021-12-21 18:11:12 +08:00 |
jiaoyangna
|
99ca3a60eb
|
适配修改提交
|
2021-12-21 18:10:34 +08:00 |
jiaoyangna
|
e96d6e5744
|
适配修改
|
2021-12-21 17:37:19 +08:00 |
jiaoyangna
|
edbf25dc59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 17:21:26 +08:00 |
jiaoyangna
|
89fdc69afd
|
添加拍脸提交
|
2021-12-21 17:21:10 +08:00 |
ZhangBiao
|
0a8bdbe4b6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:51:55 +08:00 |
ZhangBiao
|
53f7d29337
|
【商城界面】提交
|
2021-12-21 16:51:40 +08:00 |
gaoxin
|
3054bbfdeb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:34 +08:00 |
gaoxin
|
86daa70b9c
|
【特权】添加充值金额解锁类型
|
2021-12-21 16:33:28 +08:00 |
ZhangBiao
|
51d281c1ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:19 +08:00 |
ZhangBiao
|
58ffbf416c
|
【商城界面】提示修改
|
2021-12-21 16:32:59 +08:00 |
gaoxin
|
605dd4e111
|
【战斗】跳过按钮解锁提示问题修改
|
2021-12-21 15:38:42 +08:00 |
gaoxin
|
dc8e1ac904
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 14:32:01 +08:00 |
gaoxin
|
0b5ca2a460
|
【引导】引导触发方式参数开放给功能引导使用,添加触发类型37 十连结果界面打开触发
|
2021-12-21 14:31:26 +08:00 |
jiaoyangna
|
e9a7188d7d
|
十连黑屏修改提交
|
2021-12-21 13:20:29 +08:00 |
jiaoyangna
|
f094d16e53
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 13:11:24 +08:00 |
jiaoyangna
|
f9689bafde
|
删除没用的log
|
2021-12-21 13:10:52 +08:00 |
ZhangBiao
|
d189833b3f
|
【超值基金】提交
|
2021-12-21 11:35:56 +08:00 |
jiaoyangna
|
2c2d6a5e56
|
添加竞技试炼提交
|
2021-12-20 22:11:33 +08:00 |
jiaoyangna
|
c6f99b2eab
|
竞技试炼修改提交
|
2021-12-20 22:05:18 +08:00 |
jiaoyangna
|
b60d319083
|
竞技试炼修改提交
|
2021-12-20 22:03:08 +08:00 |
jiaoyangna
|
e2eada47d1
|
删除log
|
2021-12-20 22:00:12 +08:00 |
jiaoyangna
|
a19e1d1b7d
|
返回主城打开竞技试炼
|
2021-12-20 21:59:33 +08:00 |
jiaoyangna
|
a1e4acd488
|
魂印修改提交
|
2021-12-20 17:27:07 +08:00 |
jiaoyangna
|
709ae04c7f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 17:16:24 +08:00 |
jiaoyangna
|
4c3c65347c
|
魂印修改提交
|
2021-12-20 17:15:06 +08:00 |
wangzhenxing
|
4a6ee9d9aa
|
[战斗]==========战斗记录界面死亡置灰修改
|
2021-12-20 17:00:12 +08:00 |
ZhangBiao
|
8eb6abec8e
|
【家园】开坑
|
2021-12-20 16:50:51 +08:00 |
jiaoyangna
|
0051c48c65
|
点将台引导修改提交
|
2021-12-20 16:31:57 +08:00 |
jiaoyangna
|
d947607282
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 15:44:10 +08:00 |
jiaoyangna
|
b841b77467
|
关卡解锁跳转添加提交
|
2021-12-20 15:43:54 +08:00 |
wangzhenxing
|
885a6e2fa8
|
[功能]========结算记录界面添加阵亡标签
|
2021-12-20 15:32:28 +08:00 |
ZhangBiao
|
12b980590f
|
【名望】提交
|
2021-12-20 15:18:03 +08:00 |
ZhangBiao
|
777b353f4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 15:02:41 +08:00 |
ZhangBiao
|
680b956474
|
【声望】修改
|
2021-12-20 15:02:14 +08:00 |
jiaoyangna
|
5ab2f2f40a
|
关卡tips 关卡条件修改提交
|
2021-12-20 14:56:43 +08:00 |
jiaoyangna
|
7a9b2b20c6
|
玉帝剧情新手引导修改提交
|
2021-12-20 14:17:49 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
ZhangBiao
|
6d93ab7dca
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 14:05:56 +08:00 |
ZhangBiao
|
8b7b5c8fa9
|
【连购礼包】无礼包修改
|
2021-12-20 14:05:42 +08:00 |
jiaoyangna
|
997aa4831f
|
至尊降世添加拍脸
|
2021-12-20 13:41:16 +08:00 |
jiaoyangna
|
84e181ef1a
|
ID1010877】
【优化】跳过提示文字优化
|
2021-12-20 13:07:24 +08:00 |
jiaoyangna
|
f306f0141d
|
删除log
|
2021-12-20 12:55:22 +08:00 |
jiaoyangna
|
76c682eb68
|
【神将回退】将魂足够升星时,进阶页签不显示红点
|
2021-12-20 12:05:11 +08:00 |
jiaoyangna
|
b7b71930f5
|
进阶预览黑屏修改提交
|
2021-12-20 11:33:36 +08:00 |
ZhangBiao
|
9fa6f3a2b3
|
【奖励详情】报错修改
|
2021-12-20 10:30:51 +08:00 |
wangzhenxing
|
e02f9a7881
|
[战斗]======角色播放 skill 动作逻辑提交
|
2021-12-20 10:02:38 +08:00 |
ZhangBiao
|
834cdf87da
|
【新将来袭】取消珍奇宝阁
|
2021-12-17 18:59:54 +08:00 |
ZhangBiao
|
795d19d63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:53:34 +08:00 |
ZhangBiao
|
0377b2b642
|
【特惠商城】提交
|
2021-12-17 18:53:24 +08:00 |
jiaoyangna
|
e6796ee70f
|
超值返利修改提交
|
2021-12-17 18:46:05 +08:00 |
jiaoyangna
|
196cb329b3
|
提示文字修改提交
|
2021-12-17 17:48:26 +08:00 |
wangzhenxing
|
ef680be056
|
[战斗]======护盾效果修改
|
2021-12-17 17:31:58 +08:00 |
ZhangBiao
|
88980286eb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:20:24 +08:00 |
ZhangBiao
|
08806bc18f
|
【寻仙招募】改为常驻后,奖励中的概率有效期去掉
|
2021-12-17 17:20:13 +08:00 |
jiaoyangna
|
5c042b2c60
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:19:58 +08:00 |
jiaoyangna
|
893cd69527
|
特效被切修改提交
|
2021-12-17 17:19:30 +08:00 |
ZhangBiao
|
df483145bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:13:57 +08:00 |
ZhangBiao
|
a9b7c21fad
|
【道具弹窗】跳转按钮错位
|
2021-12-17 17:13:45 +08:00 |
gaoxin
|
ce0c1db2f3
|
【关卡】解锁提示资源提交
|
2021-12-27 16:55:17 +08:00 |
jiaoyangna
|
6b234c7f2f
|
文字重叠修改提交
|
2021-12-17 16:53:26 +08:00 |
jiaoyangna
|
3119f9b277
|
价格描述修改
|
2021-12-17 16:43:24 +08:00 |
jiaoyangna
|
16c00cbffc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 16:41:26 +08:00 |
jiaoyangna
|
ffd7d0ecbe
|
超值返利修改提交
|
2021-12-17 16:41:08 +08:00 |
ZhangBiao
|
8ad3346af9
|
【特惠商城】
|
2021-12-17 16:05:51 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
ZhangBiao
|
0e732fa8b6
|
【新人商城】结束后关闭
|
2021-12-17 14:44:44 +08:00 |
ZhangBiao
|
2eb83d4c63
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 14:13:53 +08:00 |
ZhangBiao
|
d34d896f47
|
【成长礼包】提交
|
2021-12-17 14:13:41 +08:00 |
gaoxin
|
db2d3c8433
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-27 14:01:06 +08:00 |
gaoxin
|
1c9d3caa75
|
【罗浮】原罗浮商店跳转到逐胜商店
|
2021-12-27 14:00:47 +08:00 |
jiaoyangna
|
1a8f01c2fd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 14:12:13 +08:00 |
jiaoyangna
|
83b1fad0b7
|
跳转修改提交
|
2021-12-17 14:11:03 +08:00 |
ZhangBiao
|
d5ae25820d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 14:00:15 +08:00 |
ZhangBiao
|
d939e6b32b
|
【新人商城】提交
|
2021-12-17 14:00:07 +08:00 |
jiaoyangna
|
abb3c4ec5f
|
跳转修改提交
|
2021-12-17 13:30:45 +08:00 |
jiaoyangna
|
2f489fecad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 13:29:24 +08:00 |
gaoxin
|
5bfb89d276
|
【关卡挂机】未解锁跳转功能添加
|
2021-12-27 13:11:33 +08:00 |
jiaoyangna
|
4fdd4e7b62
|
跳转修改提交
|
2021-12-17 13:29:08 +08:00 |
ZhangBiao
|
f4b2a09f08
|
【商城界面】和信任商城
|
2021-12-17 12:08:15 +08:00 |
ZhangBiao
|
17b286b890
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 11:28:47 +08:00 |
ZhangBiao
|
45241e1d5d
|
【商城界面】提交
|
2021-12-17 11:28:37 +08:00 |
gaoxin
|
7d02fd5394
|
【解锁提示】添加解锁条件显示
|
2021-12-27 09:58:34 +08:00 |
jiaoyangna
|
ab01f4ab25
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 11:23:11 +08:00 |
jiaoyangna
|
ec53e8ad84
|
超值返利提交
|
2021-12-17 11:22:54 +08:00 |
ZhangBiao
|
e580889f3f
|
【商城界面】无剩余次数修改
|
2021-12-17 09:56:48 +08:00 |
ZhangBiao
|
052d7418ca
|
【商城界面】提交
|
2021-12-17 09:31:45 +08:00 |
ZhangBiao
|
2cb1af4c8b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 19:22:57 +08:00 |
gaoxin
|
ab3d7e939b
|
【解锁提示】添加功能解锁提示
|
2021-12-26 19:12:25 +08:00 |
ZhangBiao
|
5393485f65
|
【商城界面】提交
|
2021-12-16 19:22:46 +08:00 |
jiaoyangna
|
740aeac6bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 18:43:36 +08:00 |
gaoxin
|
f0d9f4828f
|
【关卡新条件】条件显示在按钮上
|
2021-12-26 18:13:39 +08:00 |
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
|
33f0b51d94
|
超值返利预设代码提交
|
2021-12-16 11:45:02 +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 |
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
|
2376358ced
|
【战斗】=====战斗驱动延时修改
|
2021-12-06 19:12:44 +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 |
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 |