Commit Graph

1474 Commits (5d0d106f151f7309e05210851014bd67810ea3f8)
 

Author SHA1 Message Date
jiaoyangna c9c3cb2fa4 operatingmanager commit 2020-08-14 13:01:12 +08:00
jiaoyangna 4c8d556b31 动态立绘提交 2020-08-14 12:59:19 +08:00
zhangqiang f4cf94d61f 海外sdk测试修改 2020-08-14 12:23:32 +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
zhangqiang ea7c7c2eb4 c#文件添加 2020-08-13 18:02:30 +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
gaoxin aeb83d66ed Merge branch '0功能/接入海外SDK' into master_test_hw
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/ItemConfig.xlsx
2020-08-13 15:50:37 +08:00
gaoxin ffdcd35350 删除多余 android 工程 2020-08-13 15:49:17 +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
lihaiyang b918f8c06b 轩辕免费次数和购买次数位置修改 2020-08-13 15:33:32 +08:00
zhangqiang 5e4cdffa80 遴选提交 2020-08-13 15:18:04 +08:00
zhangqiang b6e6cd1f84 hw android sdk .lua change 2020-08-13 15:06:19 +08:00
jiaoyangna fbf7c3b41d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:44:53 +08:00
jiaoyangna 7de60dea2b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:51 +08:00
ZhangBiao a180f63fe7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:43:46 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
gongjiawei c18cb5fc01 音频更新 2020-08-13 14:23:37 +08:00
jiaoyangna beaaeed139 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:21:50 +08:00
lihaiyang 9a75e685ac 轩辕宝境邮件配合 2020-08-13 14:21:28 +08:00
liujiaqi b31f0b52d1 签到宝箱 2020-08-13 13:43:41 +08:00
ZhangBiao d1ec3fa196 每周 每月礼包阴影问题修复 2020-08-13 13:33:48 +08:00
ZhangBiao 2fe27c64ec 2020-08-13 12:33:21 +08:00
ZhangBiao a6d69bd001 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 12:00:38 +08:00
ZhangBiao f4dad25b7a 神将置换bug修复 2020-08-13 12:00:18 +08:00
gaoxin de27163861 合成修改 2020-08-13 11:46:55 +08:00
altair f17e4e319a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 11:13:17 +08:00