Commit Graph

11608 Commits (f3349ca4d19baf923b7e75c9e4a6b2014b2bf95b)
 

Author SHA1 Message Date
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
gaoxin 5eec5952ef 【协议】更新到最新 2021-12-23 14:37:31 +08:00
wangzhenxing 76d9e596b4 [战斗]======被动412 提交 2021-12-23 14:37:19 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
luyao d62532c90c 【坐骑】资源名冲突修改 2021-12-23 11:46:13 +08:00
gaoxin cf87db6577 Merge branch 'china/dev' into china/dev_res 2021-12-23 11:05:25 +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
wangzhenxing b7bfc1d867 【资源】======虎年坐骑提交 2021-12-22 16:15:51 +08:00
wangzhenxing a7dac651c6 [资源]=======罗刹spine修改 2021-12-22 16:14:42 +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
jiaoyangna 85795f19cc 适配修改提交 2021-12-21 18:12:15 +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
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 522913c7bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 21:59:54 +08:00
skuld 867f90eecd bat Resource Commit:2021/12/22, 0:37:08 2021-12-22 00:37:09 +08:00
skuld e84f78fe3f bat Resource Commit:2021/12/22, 0:35:40 2021-12-22 00:35:40 +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
jiaoyangna 9a5ac42d5c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 16:55:01 +08:00
jiaoyangna 0051c48c65 点将台引导修改提交 2021-12-20 16:31:57 +08:00
ZhangBiao 44df57188d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-20 15:45:48 +08:00
ZhangBiao 4b27fa6a1b 【副本】灰色红点提交 2021-12-20 15:45:06 +08:00