Commit Graph

11525 Commits (f148668636b3c22961615b8beb1974894f209dd5)
 

Author SHA1 Message Date
ZhangBiao f148668636 【家园】提交 2021-12-30 11:00:27 +08:00
ZhangBiao 630d56c810 【家园】装备强化升级 2021-12-29 20:17:45 +08:00
ZhangBiao a1301a4a22 【家园】任务 2021-12-29 14:03:16 +08:00
ZhangBiao 197b28b3da 【家园】加速确认 2021-12-28 18:27:31 +08:00
ZhangBiao 69cb591edb 【家园】升级进度条 2021-12-28 13:37:04 +08:00
ZhangBiao b66cfdc61d 【家园】提交 2021-12-28 11:54:08 +08:00
ZhangBiao 337261f8b2 【家园】升级,取消,加速 2021-12-24 18:20:18 +08:00
ZhangBiao dbc3395945 【家园】详情 2021-12-24 09:33:56 +08:00
ZhangBiao 078c3a1f96 Merge branch 'china/dev' into 0功能/家园 2021-12-23 17:48:20 +08:00
skuld 606bedd85c 【挂机】新人商城按钮效果修改 2021-12-23 17:43:36 +08:00
skuld 9d2f9b70cb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-23 17:31:25 +08:00
skuld bd746b40b0 bat Resource Commit:2021/12/23,17:27:24 2021-12-23 17:27:25 +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 c920c8d064 【家园】预设冲突提交 2021-12-23 14:53:14 +08:00
ZhangBiao 6fe4e5d3f6 Merge branch 'china/dev' into 0功能/家园 2021-12-23 14:49:47 +08:00
wangzhenxing 3e640aef81 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-23 14:38:02 +08:00
ZhangBiao f676ae8478 【家园】提交 2021-12-23 14:38:02 +08:00
gaoxin 5eec5952ef 【协议】更新到最新 2021-12-23 14:37:31 +08:00
wangzhenxing 76d9e596b4 [战斗]======被动412 提交 2021-12-23 14:37:19 +08:00
ZhangBiao e6d1ac6ef0 【修行】冲突修改 2021-12-23 09:53:00 +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
gaoxin be1ce2a189 【场景】添加开天新包配置 2021-12-22 15:15:02 +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
jiaoyangna 85795f19cc 适配修改提交 2021-12-21 18:12:15 +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
ZhangBiao 462ac9c494 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-21 13:24:11 +08:00
ZhangBiao b9bb2cf544 【修行】星数到达四位后只显示三位 2021-12-21 13:23:16 +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