Commit Graph

1536 Commits (98e9b9757e81f73f8c7f9d645e56389d7940624c)
 

Author SHA1 Message Date
jiaoyangna 740eb7253d xuanyuan commit 2020-08-14 20:41:07 +08:00
JieLing 66687a1ce4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:49:33 +08:00
jiaoyangna 481c818ffa Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:43:30 +08:00
jiaoyangna 84f82d488d live2d commit 2020-08-14 17:43:24 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing 5e9448dd24 资源提交, 2020-08-14 17:35:18 +08:00
JieLing ad3ee94a75 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
lihaiyang 9391b8d988 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 17:12:54 +08:00
lihaiyang 8e438f9d20 开启时间修正
周一开启妖灵宝境;
周二开启佛禅宝境;
周三开启人杰宝境;
周四开启道玄宝境;
周五开启妖灵宝境和人杰宝境;
周六开启佛禅宝境和道玄宝境;
周日开启所有四种宝境。
2020-08-14 17:11:58 +08:00
liujiaqi cda648c50a 新东华帝君通天教主123星大小卡牌 2020-08-14 16:45:09 +08:00
jiaoyangna 0b157b6ee8 轩辕宝镜入口替换 2020-08-14 16:09:00 +08:00
wangzhenxing 78e2d45288 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 16:51:03 +09:00
wangzhenxing e139a43f65 屏蔽金翅大鹏不死效果 2020-08-14 16:50:32 +09:00
jiaoyangna e88e7544c2 通关豪礼替换 2020-08-14 14:41:29 +08:00
jiaoyangna 4604df2d0b 修改轩辕副本立绘 2020-08-14 14:36:24 +08:00
jiaoyangna 40b9550c54 修改轩辕副本立绘提交 2020-08-14 14:35:48 +08:00
jiaoyangna d27b4b165f 资源名重复修改提交 2020-08-14 14:29:06 +08:00
jiaoyangna cb8174dd85 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 14:17:45 +08:00
jiaoyangna 3834e1960e 图片导入 2020-08-14 14:17:38 +08:00
shihongyi 768ea83f23 塔战力 2020-08-14 14:09:04 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
jiaoyangna 905d77b0c6 Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-14 13:01:17 +08:00
jiaoyangna c9c3cb2fa4 operatingmanager commit 2020-08-14 13:01:12 +08:00
jiaoyangna 4c8d556b31 动态立绘提交 2020-08-14 12:59:19 +08:00
jiaoyangna b4acffd954 动态立绘提交 2020-08-14 12:20:29 +08:00
liujiaqi 8366d5d54e 大小经验金币包矿镐,矿镐包,一键购买 2020-08-14 11:16:18 +08:00
shihongyi acd9da4f15 暂时开启云梦祈福 2020-08-14 10:46:55 +08:00
ZhangBiao 92a2eb18a0 Merge branch '0功能/活动' into master_develop 2020-08-14 10:15:49 +08:00
ZhangBiao 7a1e1599d8 2020-08-14 10:14:53 +08:00
JieLing be59c59230 部分大图资源整理 2020-08-14 10:02:24 +08:00
lihaiyang 95d6d13f25 轩辕全天开启 英文名字重复 2020-08-14 09:40:52 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
lihaiyang ce7f4b2790 修改轩辕宝境怪物属性 2020-08-13 21:54:58 +08:00
altair 47f8542201 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 20:59:17 +08:00
altair 5edfd6548e 修改传记错误 2020-08-13 20:59:07 +08:00
shihongyi deeedf7aea 塔怪1 2020-08-13 20:55:47 +08:00
shihongyi 93a20786cb 限时兑换 2020-08-13 20:39:55 +08:00
JieLing acf9a73068 重复引用资源修改 2020-08-13 19:40:50 +08:00
JieLing 700f396a6b 资源加密添加,防止使用工具获得资源 2020-08-13 19:30:16 +08:00
wangzhenxing 9dce11a6eb 测试战斗修改提交 2020-08-13 17:36:20 +09:00
ZhangBiao 41cea65207 2020-08-13 17:17:01 +08:00
ZhangBiao d4280f8ed2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 17:07:21 +08:00
ZhangBiao e655562a71 2020-08-13 17:07:05 +08:00
shihongyi bae1143471 剑影仙踪拍脸等级、兑换活动控制 2020-08-13 16:53:07 +08:00
ZhangBiao 9bac8e2bfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 16:38:57 +08:00
ZhangBiao e397fa88e7 2020-08-13 16:38:40 +08:00
wangzhenxing 442877d3e0 珍奇宝阁预设代码提交 2020-08-13 16:38:20 +09:00
skuld 451a279458 添加轩辕宝境入口描述文字 2020-08-13 15:47:12 +08:00
lihaiyang 76e7b5d406 轩辕宝境怪物属性初版 2020-08-13 15:38:53 +08:00
lihaiyang 8702f62d1f 轩辕宝境开启等级修改为75级 2020-08-13 15:35:05 +08:00