Commit Graph

6211 Commits (caa32bac702a483510ae9f58bf3ea3b9cc32b456)
 

Author SHA1 Message Date
ZhangBiao bcf845ae38 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
zhangqiang 3686c2a75f 【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 2021-05-18 15:58:44 +08:00
gaoxin 5c8ee62e42 【公告】添加空值判段 2021-05-18 15:53:44 +08:00
gaoxin 2b693b417e 【跳转】活动跳转添加开启判断 2021-05-18 15:50:17 +08:00
gaoxin 1da9223506 【公告】修改公告的字段名,version工具添加公告配置 2021-05-18 15:37:37 +08:00
zhangqiang c27ddeb2a4 【山河社稷图】编队加职能 调副关卡恭喜获得背景层级 2021-05-18 15:17:05 +08:00
wangzhenxing d19c7e1baf 图片提交 2021-05-18 15:02:15 +08:00
wangzhenxing 9ebc0f8401 公告修改提交 2021-05-18 15:01:59 +08:00
ZhangBiao 93b8746cfe 【修行】玩家信息界面神印提交 2021-05-18 14:59:47 +08:00
zhangqiang 433bcf9ddb 【添加音效】 2021-05-18 14:24:09 +08:00
jiaoyangna 85f0581895 元字,展示了两种艺术字 2021-05-18 14:13:54 +08:00
jiaoyangna ae913260f8 18、30、68元档位切换按钮,可触碰区域加大 2021-05-18 11:44:51 +08:00
gaoxin 8ed3371932 【限时召唤】修复左上角奖励领取报错 2021-05-18 11:42:47 +08:00
ZhangBiao db0ede868d 【特权】保持开启 2021-05-18 09:35:25 +08:00
zhangqiang be1b1698b5 【山河社稷图】提交 2021-05-17 20:08:33 +08:00
ZhangBiao 1086f182a0 【修行】提交 2021-05-17 19:49:48 +08:00
zhangqiang 32eace4be7 【山河社稷图】一键上阵修改 2021-05-17 19:34:23 +08:00
zhangqiang fae85fc903 【魂印图鉴修改】 2021-05-17 18:24:47 +08:00
ZhangBiao d0d20db65b Merge branch 'china/dev-c' into 0功能/修行玩法 2021-05-17 17:57:45 +08:00
ZhangBiao 1ee46493ab 【修行】上方玩家名字颜色修改 2021-05-17 17:56:23 +08:00
zhangqiang d1e27ccdc3 【山河社稷图】编队bug 2021-05-17 17:54:21 +08:00
ZhangBiao 0fa0f251ba 【修行】巅峰赛名字颜色修改 2021-05-17 17:42:08 +08:00
ZhangBiao 8e1b42c0ac 【修行】名字颜色修改 2021-05-17 17:28:37 +08:00
ZhangBiao 8d2a0a86aa 【修行】战斗卡住提交 2021-05-17 16:04:39 +08:00
gaoxin e76fb1dede 【社稷大典】修复未加入公会时,取消无限循环的问题 2021-05-17 15:49:59 +08:00
ZhangBiao d53415d80b 【修行】名字颜色 2021-05-17 15:48:41 +08:00
zhangqiang f6fb0c2071 【山河社稷图】宝箱奖励预览 2021-05-17 15:39:08 +08:00
ZhangBiao ffd695f3b1 【修行】名字提交 2021-05-17 15:20:20 +08:00
ZhangBiao 58e7cea17e 【修行】名字颜色提交 2021-05-17 14:34:37 +08:00
gaoxin b9d362b333 【屏幕适配】活动适配优化 2021-05-17 14:32:42 +08:00
ZhangBiao 10481bc650 【修行】名字颜色修改 2021-05-17 14:15:55 +08:00
ZhangBiao 6385b78048 【meta提交】 2021-05-17 11:59:01 +08:00
ZhangBiao 2b81c437e8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-17 11:58:06 +08:00
ZhangBiao beb2d5b56c 【修行】提交 2021-05-17 11:57:54 +08:00
zhangqiang 5b4be5ef37 【山河社稷图】战斗回放提示 2021-05-17 11:55:34 +08:00
zhangqiang 810139a324 【协议合并提交】刷资源提交 2021-05-17 11:28:54 +08:00
zhangqiang 8e428148c4 【山河社稷图】提交 2021-05-17 11:15:43 +08:00
zhangqiang e763e54799 Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-05-17 11:04:01 +08:00
ZhangBiao c5df85efae 【修行】提交 2021-05-17 10:54:36 +08:00
ZhangBiao f3cb51c858 【预设冲突】冲突修改后提交 2021-05-17 10:35:58 +08:00
ZhangBiao 8003c43f71 Merge branch 'china/dev-c' into 0功能/修行玩法 2021-05-17 10:32:30 +08:00
ZhangBiao 307c2c1e37 【冲突处理】复制general(big)popup 2021-05-17 10:31:45 +08:00
ZhangBiao 29b8fd144e Revert "【修行】提交,预设冲突处理"
This reverts commit 79910218c5.
2021-05-17 10:29:34 +08:00
wangzhenxing 51392f0a62 服务器战斗逻辑同表工具修改 2021-05-17 10:21:23 +08:00
ZhangBiao 79910218c5 【修行】提交,预设冲突处理 2021-05-17 10:21:08 +08:00
ZhangBiao 5fe75af0bf Merge branch 'china/dev' into 0功能/修行玩法 2021-05-17 10:15:42 +08:00
ZhangBiao b13dabcad2 【修行】提交 2021-05-17 09:50:32 +08:00
gaoxin 533fd17972 【公会】满级显示添加 2021-05-15 18:03:25 +08:00
gaoxin 02649f00ca Merge branch 'china/dev' into china/dev-c 2021-05-15 17:40:21 +08:00
gaoxin eac86d749f 【gm】引导测试功能优化 2021-05-15 17:38:58 +08:00