Commit Graph

7679 Commits (40e37473dc6fe9812e34a041e24b0e2fcca92714)

Author SHA1 Message Date
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
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
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
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