ZhangBiao
|
2599afd6de
|
【寻仙招募】心愿选飞升石,查看奖励报错
|
2022-01-13 15:28:09 +08:00 |
jiaoyangna
|
0e8e6e1874
|
探索修改提交
|
2022-01-13 13:59:15 +08:00 |
jiaoyangna
|
8b4533aac9
|
一键探索调整编队后探索地图修改提交
|
2022-01-13 11:17:18 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
jiaoyangna
|
05e078dadc
|
探索引导修改提交
|
2022-01-12 15:27:35 +08:00 |
ZhangBiao
|
60c31c1d5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:20:19 +08:00 |
ZhangBiao
|
617a557071
|
【家园】修改按钮
|
2022-01-11 18:20:12 +08:00 |
ZhangBiao
|
9826244e7e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:19:02 +08:00 |
ZhangBiao
|
8d82a962a6
|
【家园】特效提交
|
2022-01-11 18:18:41 +08:00 |
ZhangBiao
|
e3c1c348e7
|
【家园】特权剩余时间修改
|
2022-01-11 13:29:58 +08:00 |
ZhangBiao
|
c40be4411d
|
【家园】特权时间显示跳帧
|
2022-01-10 18:22:20 +08:00 |
ZhangBiao
|
567f5c1aa0
|
【家园】升级倒计时显示错误修改
|
2022-01-10 17:38:02 +08:00 |
ZhangBiao
|
2455410a0c
|
【命格】镶嵌按钮显示穿戴
|
2022-01-10 15:29:37 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
gaoxin
|
6ddd4c543f
|
【修为】修为点击问号,弹出鬼畜动画,当前是元婴期
|
2022-01-10 15:06:16 +08:00 |
ZhangBiao
|
c157985e24
|
【建木神树】调整
|
2022-01-08 11:36:31 +08:00 |
ZhangBiao
|
54b01f4d86
|
【家园+易经宝库】提交
|
2022-01-06 18:42:20 +08:00 |
ZhangBiao
|
e0c228bf3f
|
【易经宝库】提交
|
2022-01-06 18:27:09 +08:00 |
ZhangBiao
|
956826c46a
|
【家园】摘星阁提交
|
2022-01-06 17:53:53 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
jiaoyangna
|
79364232f0
|
【ID1010966】
【优化】法宝聚灵调整
|
2022-01-06 14:52:02 +08:00 |
ZhangBiao
|
893e33d920
|
【家园】提交
|
2022-01-06 10:33:08 +08:00 |
ZhangBiao
|
2f03bf5ab7
|
【家园】提交
|
2022-01-05 19:12:54 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
aa761fc4e9
|
【家园】提交
|
2022-01-05 18:04:57 +08:00 |
ZhangBiao
|
b45f74781c
|
【家园】提交
|
2022-01-05 17:06:34 +08:00 |
ZhangBiao
|
6f4942e87e
|
【家园】提交
|
2022-01-05 16:21:20 +08:00 |
ZhangBiao
|
f0de43aad2
|
【家园】提交
|
2022-01-05 14:17:53 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
19c27ae7bb
|
【家园】提交
|
2022-01-05 10:12:23 +08:00 |
ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
ZhangBiao
|
14044932b5
|
【命格】属性加成报错修改
|
2022-01-04 16:57:52 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
jiaoyangna
|
ebc67f1602
|
战力修改提交
|
2022-01-04 14:21:54 +08:00 |
ZhangBiao
|
39244f8ce5
|
【家园】特权完成,2021最后的提交!!
|
2021-12-31 18:58:04 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
gaoxin
|
d1b84299c2
|
【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
|
2022-01-03 02:43:00 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
jiaoyangna
|
d4d1653bc2
|
探索优化
|
2021-12-30 14:01:30 +08:00 |
jiaoyangna
|
4b6de5c984
|
探索优化提交
|
2021-12-30 13:27:57 +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 |
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
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +08:00 |
jiaoyangna
|
9dafa85858
|
探索提交
|
2021-12-28 13:30:27 +08:00 |
ZhangBiao
|
b66cfdc61d
|
【家园】提交
|
2021-12-28 11:54:08 +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
|
b9a86b402c
|
探索提交
|
2021-12-27 14:53:55 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
jiaoyangna
|
5f9f7da264
|
探索提交
|
2021-12-24 17:49:54 +08:00 |
jiaoyangna
|
88130ac4dd
|
探索提交
|
2021-12-24 14:09:48 +08:00 |
jiaoyangna
|
7f0e684bc0
|
一键探索修改提交
|
2021-12-24 11:18:03 +08:00 |
jiaoyangna
|
130a75c8dd
|
探索提交
|
2021-12-24 00:14:32 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
jiaoyangna
|
7bb3325c99
|
探索提交
|
2021-12-23 13:09:34 +08:00 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
jiaoyangna
|
b7b71930f5
|
进阶预览黑屏修改提交
|
2021-12-20 11:33:36 +08:00 |
jiaoyangna
|
bf73593d04
|
进阶预览提交
|
2021-12-20 11:32:23 +08:00 |
ZhangBiao
|
08806bc18f
|
【寻仙招募】改为常驻后,奖励中的概率有效期去掉
|
2021-12-17 17:20:13 +08:00 |
ZhangBiao
|
e1a9459101
|
【命格】提交
|
2021-12-14 16:17:49 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
ZhangBiao
|
9140a632f9
|
【命格】提交
|
2021-12-10 14:57:23 +08:00 |
ZhangBiao
|
982137c9b7
|
【命格】提交
|
2021-12-10 14:14:08 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
ZhangBiao
|
f067ae5080
|
【命格】提交
|
2021-12-10 11:40:15 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
ZhangBiao
|
7bcc95f31f
|
【命格】提交
|
2021-12-08 18:34:56 +08:00 |
ZhangBiao
|
655021fe3f
|
【命格】战力升降显示
|
2021-12-08 18:21:28 +08:00 |
ZhangBiao
|
4f1e129473
|
【命格】加成预览提交
|
2021-12-08 17:27:22 +08:00 |
ZhangBiao
|
1efc9fc56b
|
【命格】命石穿戴
|
2021-12-08 09:29:08 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
jiaoyangna
|
ff48e4c11f
|
天地烘炉修改提交
|
2021-11-29 16:35:23 +08:00 |
jiaoyangna
|
dae57bb8ee
|
添加天地洪炉法宝碎片读表设置
|
2021-11-29 14:38:57 +08:00 |
jiaoyangna
|
5fb0af7e00
|
颜色修改提交
|
2021-11-27 18:12:37 +08:00 |
jiaoyangna
|
e9862a7046
|
抽卡提示修改提交
|
2021-11-27 15:29:46 +08:00 |
jiaoyangna
|
0c6ff17ddd
|
修改提交
|
2021-11-27 14:30:51 +08:00 |
jiaoyangna
|
5bba220ad5
|
添加跳转
|
2021-11-26 18:30:08 +08:00 |
jiaoyangna
|
410fb55f66
|
天地烘炉提交
|
2021-11-26 18:10:02 +08:00 |
jiaoyangna
|
1a40cfba00
|
天地烘炉提交
|
2021-11-26 17:54:35 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +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
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |