Commit Graph

9025 Commits (aa7c9408ed086e568740a17c1e7ed552050ca73c)
 

Author SHA1 Message Date
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna 82b992c4ca 我的助战报错修改提交 2021-08-31 17:12:30 +08:00
jiaoyangna d660fe362e 装备宝物界面修改提交 2021-08-31 17:06:01 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
gaoxin 7af7478699 【icon】添加新的出包ICon 2021-08-31 15:44:48 +08:00
gaoxin 6d2253347a 【icon】添加新的出包ICon 2021-08-31 15:42:25 +08:00
gaoxin cb8589eba6 【包配置】修改专服包的母包功能 2021-08-31 15:27:01 +08:00
gaoxin 6e79e38b75 【包配置】修改专服包的母包功能 2021-08-31 15:26:22 +08:00
gaoxin 1c7d7427e4 【战斗】被动添加时Log 2021-08-31 15:22:02 +08:00
wangzhenxing 2211be3b61 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 15:21:55 +08:00
gaoxin 9eb136df40 【战斗】添加一些战斗日志 2021-08-31 15:21:27 +08:00
gaoxin 7ef231e7a8 【战斗】修复战斗报错 2021-08-31 15:21:22 +08:00
jiaoyangna dd93f737ff 排行榜上好友宝器修改 2021-08-31 15:05:17 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
jiaoyangna d7d8a6071b 特希奥层级修改提交 2021-08-31 14:41:35 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
jiaoyangna 72931e8ad6 失败返回报错修改 2021-08-31 13:59:03 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 209bd7ed0c 四元阵特效修改提交
(cherry picked from commit f355940615)
2021-08-31 10:54:32 +08:00
jiaoyangna 03b00d7762 四元阵特效修改提交 2021-08-31 10:52:58 +08:00
jiaoyangna f355940615 四元阵特效修改提交 2021-08-31 10:52:02 +08:00
jiaoyangna 0027722366 四灵修改提交 2021-08-30 20:07:20 +08:00
ZhangBiao e68d6a2b23 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 18:45:31 +08:00
ZhangBiao 4e9ce855f2 【玩家神将信息界面】魂印本身战力不增加修改 2021-08-30 18:45:21 +08:00
gaoxin 9744f908a5 【数数】修复Android平台下IOS组件找不到的问题 2021-08-30 18:16:29 +08:00
gaoxin a3f6147779 【Logo】删除SDKConfig 2021-08-30 18:16:23 +08:00
gaoxin f0115a8e07 【数数】修复Android平台下IOS组件找不到的问题 2021-08-30 18:15:54 +08:00
ZhangBiao 6dca507aaf 【推荐工会】 2021-08-30 18:14:13 +08:00
ZhangBiao 911c1849b2 【工会推荐】搜索修改 2021-08-30 18:14:07 +08:00
ZhangBiao ec638f7c7a 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 18:14:03 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
ZhangBiao 1f2a21a587 【推荐工会】 2021-08-30 16:24:30 +08:00
ZhangBiao 78f4dccc1e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:37:22 +08:00
ZhangBiao f484e60f87 【工会推荐】搜索修改 2021-08-30 15:37:10 +08:00
gaoxin 2da3f4b8e5 【Logo】删除SDKConfig 2021-08-30 15:35:14 +08:00
ZhangBiao ca59c47cce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:29:35 +08:00
ZhangBiao 671f3cfb28 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 15:29:22 +08:00
gaoxin 790af4ec62 【修复数数SDK升级导致本地报错】 2021-08-30 14:59:58 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
wangzhenxing 172f800d2e 【战斗】=============杨戬新技能特效提交 2021-08-30 14:14:48 +08:00
gaoxin 3a8fac4f87 【修复数数SDK升级导致本地报错】 2021-08-30 12:29:13 +08:00
gaoxin 61bfa0d326 【尝试升级数数】 2021-08-28 20:32:19 +08:00