Commit Graph

1390 Commits (112fa909b75321e288705908f8d2d8962867b901)
 

Author SHA1 Message Date
zhangqiang 112fa909b7 月卡埋点修改 充值商店六个商品换美元符号 2020-08-14 15:05:54 +08:00
zhangqiang f4cf94d61f 海外sdk测试修改 2020-08-14 12:23:32 +08:00
zhangqiang ea7c7c2eb4 c#文件添加 2020-08-13 18:02:30 +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
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 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
altair 9d986d7c0b 修改道具图标及名称 2020-08-13 11:13:00 +08:00
gaoxin b4eef8c285 神将合成显示修改 2020-08-13 11:11:26 +08:00
altair 87bc5b7dfd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 10:29:45 +08:00
altair b9b78ca37e 修改置换玉图标 2020-08-13 10:29:33 +08:00
gaoxin 48d8f3887b 修改神将合成显示问题 2020-08-13 10:28:16 +08:00
liujiaqi 4e54d85fdc 技能选择目标回调 2020-08-13 10:14:39 +08:00
shihongyi dee104669b ##bug 2020-08-13 09:51:22 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
liujiaqi c4938b7bd3 修正英雄主动技能,天赋,法宝,魂印描述增加标点 2020-08-12 20:42:57 +08:00
shihongyi 1de6a6bd83 bug、幻境 2020-08-12 20:41:22 +08:00
altair 4a60554eab Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 19:50:33 +08:00
altair fde8f838a6 修改道具图标 2020-08-12 19:50:22 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
gongjiawei 0d0ae17a68 音频更新 2020-08-12 18:11:39 +08:00
gongjiawei a5663aae42 音频更新 2020-08-12 17:53:48 +08:00
ZhangBiao 0931365a3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-12 17:03:49 +08:00
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
shihongyi 60eb6d985d bugfix 2020-08-12 17:00:26 +08:00
zhangqiang e8e94525d4 接入SDK 新增临时 Android 工程 2020-08-12 16:33:53 +08:00
gongjiawei b4e8c6803c 音频更新 2020-08-12 16:02:35 +08:00
gaoxin 809e10df79 Merge branch 'master_develop2' into master_develop 2020-08-12 14:45:01 +08:00
jiaoyangna 755565d9bd Merge branch 'xuanyuanbaojing' into master_develop2 2020-08-12 14:44:22 +08:00
lihaiyang af2d171298 合并添加轩辕宝境对应礼包 2020-08-12 14:33:12 +08:00
lihaiyang d6485a1d78 Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-12 14:31:14 +08:00
jiaoyangna 8c27eecbf6 xuanyuan update 2020-08-12 14:30:55 +08:00
lihaiyang c3fe86af56 轩辕宝境添加对应道具 2020-08-12 14:30:42 +08:00
jiaoyangna 0573c0dd4f Merge branch 'xuanyuanbaojing' into master_develop2 2020-08-12 14:30:24 +08:00
jiaoyangna 2de73b3eb1 轩辕 update 2020-08-12 14:29:06 +08:00
lihaiyang 27980e88e7 轩辕合并表格 轩辕宝境从四个变成一个 2020-08-12 14:27:19 +08:00
jiaoyangna d5c241208d merge 2020-08-12 14:25:36 +08:00
gaoxin 4e639d2401 Merge branch 'master_develop2' into master_develop 2020-08-12 14:22:29 +08:00