Commit Graph

6412 Commits (992267821069ef06ec7dd3e8489bfcbc24e74d96)
 

Author SHA1 Message Date
zhangqiang 9922678210 【山河社稷图】开启章节界面修改 2021-05-27 23:09:37 +08:00
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 95b207e1eb 【每日礼包】一键购买点击无效 2021-05-27 22:24:28 +08:00
gaoxin cf287eabda 【资源】重复资源删除 2021-05-27 22:12:08 +08:00
gaoxin c9018a097f 【打包工具】修复只打包时不替换version文件的问题 2021-05-27 22:11:32 +08:00
gaoxin a1df6cbcf5 【战斗】尝试修复竞技场战斗报错 2021-05-27 22:11:06 +08:00
jiaoyangna 8e22dc72eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:49:41 +08:00
jiaoyangna 9ef020d022 重复资源修改提交 2021-05-27 20:49:35 +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
jiaoyangna cb906bed77 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:19:29 +08:00
jiaoyangna 99d57b1497 怪物脚步声修改提交 2021-05-27 20:19:18 +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 916a777f59 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:30:56 +08:00
gaoxin 58aa9bce25 【嘿嘿】有个报错 2021-05-27 18:30:45 +08:00
ZhangBiao 4b2a71c6eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 18:29:06 +08:00
ZhangBiao dd29682429 【成长礼包】新换的会动的玉皇大帝,后面没背景 2021-05-27 18:28:49 +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 6050b780dd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:58:02 +08:00
ZhangBiao 45602214d8 【修行】特效增加 2021-05-27 17:57:49 +08:00
gaoxin 59827fb333 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 17:50:56 +08:00
gaoxin cb367d4928 【排行榜】界面显示优化 2021-05-27 17:50:30 +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 0ca658e6a4 【资源】新增法宝,物品资源 2021-05-27 17:16:30 +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 33505d1758 【资源】排行榜再优化 2021-05-27 16:42:28 +08:00
gaoxin c8a8683be0 【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星 2021-05-27 16:38:31 +08:00