Commit Graph

4394 Commits (cde2379d78d80d1efe7ebdbb60ebd0708a595011)

Author SHA1 Message Date
jiaoyangna cde2379d78 常量重复修改 2021-05-27 22:43:50 +08:00
jiaoyangna 765d58f459 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 22:34:15 +08:00
jiaoyangna a996bbc219 无尽修改提交 2021-05-27 22:34:11 +08:00
gaoxin a1df6cbcf5 【战斗】尝试修复竞技场战斗报错 2021-05-27 22:11:06 +08:00
gaoxin 38e4008d81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:45:26 +08:00
gaoxin f5071a9845 【bug】修复战斗结算报错,修复挂机奖励提升白片 2021-05-27 20:45:20 +08:00
zhangqiang 0b2ef33938 【山河社稷图】特效修改提交 2021-05-27 20:29:05 +08:00
gaoxin 89c2517cc7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:24:58 +08:00
gaoxin d0b8f8db8e 【bug】修复报错 2021-05-27 20:24:33 +08:00
jiaoyangna d9c94e250f 删除log 2021-05-27 20:24:10 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
ZhangBiao 4b54176492 【协议提交】 2021-05-27 20:08:32 +08:00
ZhangBiao b0226b664f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 19:55:10 +08:00
ZhangBiao 13b222d998 【每日豪礼】可领取,没红点 2021-05-27 19:54:54 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna 20f117702c 无尽副本修改提交 2021-05-27 18:37:51 +08:00
gaoxin 58aa9bce25 【嘿嘿】有个报错 2021-05-27 18:30:45 +08:00
gaoxin 9f8858b4f7 【主界面】左上角按钮自动排列 2021-05-27 18:20:32 +08:00
gaoxin 8ebd47a087 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:13:08 +08:00
gaoxin ba4debba7b 【主界面】左上角按钮自动排列 2021-05-27 18:13:03 +08:00
jiaoyangna b1cf308eeb 无尽修改提交 2021-05-27 18:08:26 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
ZhangBiao b5fa65a2fa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:41:15 +08:00
ZhangBiao b417d4eaa4 【修行】特效导入 2021-05-27 17:40:54 +08:00
gaoxin 21208dcf58 【挂机】金钱特效报错 2021-05-27 17:39:36 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
gaoxin 8bdf3b73bd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:53:10 +08:00
gaoxin 0ac40f3ce5 【战斗】精英副本战斗数据nodeId位置错误 2021-05-27 16:52:47 +08:00
zhangqiang fd964d842b 【提交】 2021-05-27 16:51:29 +08:00
gaoxin b25a6c01ff Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:51:20 +08:00
gaoxin 9b1a412eb8 【log】无用log删除 2021-05-27 16:50:49 +08:00
ZhangBiao 5d92af4aea Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:44:16 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
gaoxin c8a8683be0 【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星 2021-05-27 16:38:31 +08:00
gaoxin a1ba397b9c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:16:39 +08:00
gaoxin eaa3d5de88 【日常副本】跳过还原 2021-05-27 16:16:21 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 56463b82bb 【漏提】 2021-05-27 15:20:21 +08:00
jiaoyangna a9b52e6834 无尽副本修改提交 2021-05-27 15:16:46 +08:00
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
ZhangBiao a6512d2778 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:44:59 +08:00
ZhangBiao f832ecfc33 【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡 2021-05-27 14:44:49 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
ZhangBiao 0c78275a6e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:09:51 +08:00
ZhangBiao e615af9011 【福星高照】bug修改 2021-05-27 14:09:39 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
jiaoyangna 7d5ff8c3f1 设置按钮修改 2021-05-27 14:05:05 +08:00
gaoxin 3870a1cec6 【竞技场】在线跨0点,免费次数不刷 2021-05-27 11:43:27 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00