ZhangBiao
|
4a696f3ec0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-20 16:42:37 +08:00 |
ZhangBiao
|
054f1558bc
|
bug修复
|
2020-07-20 16:42:20 +08:00 |
zhangqiang
|
f24e7cbef3
|
排行榜请求修改
|
2020-07-20 16:38:26 +08:00 |
zhangqiang
|
f234c1a174
|
竞技场中文字修改
|
2020-07-20 16:07:30 +08:00 |
zhangqiang
|
99f885ac22
|
竞技场宝箱奖励位置可配
|
2020-07-20 16:01:16 +08:00 |
gongjiawei
|
4b946aa324
|
音頻跟新
|
2020-07-20 15:52:33 +08:00 |
gongjiawei
|
78717037c0
|
音频更新
|
2020-07-20 15:50:31 +08:00 |
gaoxin
|
ed0a54ab56
|
sdk更新,修改tapdb的channel对测试服和正式服进行区分
|
2020-07-20 15:36:25 +08:00 |
zhangqiang
|
a325bfb781
|
竞技场排名
|
2020-07-20 15:34:30 +08:00 |
gongjiawei
|
b2380c9b62
|
音频更新
|
2020-07-20 14:04:23 +08:00 |
zhangqiang
|
c471a9ccd5
|
竞技场替换宝箱效果图替换
|
2020-07-20 11:28:19 +08:00 |
ZhangBiao
|
97bfdd53b6
|
十绝阵开启阶段加入公会不可挑战十绝阵
|
2020-07-20 11:21:16 +08:00 |
ZhangBiao
|
43f7ca10bc
|
|
2020-07-20 11:02:40 +08:00 |
ZhangBiao
|
f9ecb13bd3
|
战斗跳过按钮
|
2020-07-20 10:40:55 +08:00 |
ZhangBiao
|
055c5f6926
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-20 10:02:21 +08:00 |
ZhangBiao
|
c0d053c65c
|
免费抽刷新时间
|
2020-07-20 10:02:12 +08:00 |
jiaoyangna
|
b11c108e5d
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-07-20 09:47:28 +08:00 |
gaoxin
|
5c962f330a
|
Merge branch '接入SDK' into master_test
# Conflicts:
# Assets/Effect.meta
# BuildABs/Android/files.unity3d
# BuildABs/Android/lzma/luabytes.unity3d
# BuildABs/Android/lzma/resconfigs.unity3d
# ProjectSettings/ProjectSettings.asset
|
2020-07-18 19:55:02 +08:00 |
gaoxin
|
90e9548549
|
ext字段修改
|
2020-07-18 19:48:39 +08:00 |
gaoxin
|
a1acdd13fb
|
支付接口接入,打点数据完善
|
2020-07-18 19:24:19 +08:00 |
zhangqiang
|
c6b5321424
|
bug
|
2020-07-17 20:52:44 +08:00 |
zhangqiang
|
480e810478
|
添加文字
|
2020-07-17 20:06:48 +08:00 |
zhangqiang
|
a8427d034c
|
字体修改
|
2020-07-17 19:48:25 +08:00 |
zhangqiang
|
57981fc393
|
字体修改
|
2020-07-17 19:36:23 +08:00 |
JieLing
|
af9f316417
|
Merge branch 'master_develop' into master_test
|
2020-07-17 18:29:48 +08:00 |
jiaoyangna
|
0715821074
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 18:20:41 +08:00 |
jiaoyangna
|
9876ec5f5a
|
红点检测修改
|
2020-07-17 18:20:31 +08:00 |
gongjiawei
|
05fe46a84e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 18:06:24 +08:00 |
gongjiawei
|
3c6db51497
|
音频更新
|
2020-07-17 18:06:10 +08:00 |
jiaoyangna
|
b56682cafd
|
5点刷新添加一个特权id
|
2020-07-17 18:04:37 +08:00 |
zhangqiang
|
19046587e4
|
竞猜结果修改
|
2020-07-17 17:59:46 +08:00 |
JieLing
|
d4ac5059df
|
Merge branch 'master_develop' into master_test
|
2020-07-17 17:51:23 +08:00 |
gaoxin
|
b099f0e251
|
数据打点静态数据添加
|
2020-07-17 17:50:05 +08:00 |
jiaoyangna
|
3f576bbf3e
|
首充战斗换id
|
2020-07-17 17:40:30 +08:00 |
JieLing
|
29fc6f99eb
|
Merge branch 'master_develop' into master_test
|
2020-07-17 17:00:55 +08:00 |
zhangqiang
|
6e59d44e5a
|
先屏蔽宝器一键合成
|
2020-07-17 16:40:38 +08:00 |
gongjiawei
|
8640cc4327
|
音频更新
|
2020-07-17 16:13:57 +08:00 |
JieLing
|
c46047fe2c
|
Merge branch 'master_develop' into master_test
# Conflicts:
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-17 16:13:04 +08:00 |
ZhangBiao
|
ea564d7a7d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 16:06:01 +08:00 |
ZhangBiao
|
2db96229ca
|
战斗跳过按钮大小调整
|
2020-07-17 16:05:39 +08:00 |
gaoxin
|
4e67a3f0bc
|
修复挂机界面黑边为题
|
2020-07-17 15:55:20 +08:00 |
gaoxin
|
62c282f6e0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 15:55:00 +08:00 |
gongjiawei
|
61bee0b20b
|
音频更新
|
2020-07-17 15:49:57 +08:00 |
szxhzz
|
95e9f57db5
|
音频更新
|
2020-07-17 15:41:04 +08:00 |
zhangqiang
|
264f0b7323
|
bug
|
2020-07-17 15:14:15 +08:00 |
gaoxin
|
720c82aa0b
|
删除开场视频
|
2020-07-17 14:53:22 +08:00 |
gongjiawei
|
7e72d741c9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 14:48:27 +08:00 |
gongjiawei
|
765e2350ab
|
音频更新
|
2020-07-17 14:47:10 +08:00 |
ZhangBiao
|
064ad3b8b7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 14:40:43 +08:00 |
ZhangBiao
|
b20e5e2f54
|
十绝阵伤害显示调整
|
2020-07-17 14:40:33 +08:00 |
jiaoyangna
|
e63fb9e0cf
|
修改文字
|
2020-07-17 14:35:38 +08:00 |
jiaoyangna
|
068980325a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 14:15:56 +08:00 |
jiaoyangna
|
7faa067c52
|
宝物分解提交
|
2020-07-17 14:15:42 +08:00 |
ZhangBiao
|
cb745e26c9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 13:58:45 +08:00 |
ZhangBiao
|
058d079190
|
18岁
|
2020-07-17 13:58:22 +08:00 |
zhangqiang
|
98670958a0
|
首冲拍脸 寻宝红点条件
|
2020-07-17 13:56:30 +08:00 |
ZhangBiao
|
63b8b36a37
|
剔除logo等信息
|
2020-07-17 13:38:02 +08:00 |
JieLing
|
00422c4be7
|
修复战斗报错
|
2020-07-17 11:51:36 +08:00 |
gaoxin
|
76d00dce34
|
支付接口调试
|
2020-07-17 11:39:24 +08:00 |
jiaoyangna
|
d1fd538542
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 11:38:26 +08:00 |
jiaoyangna
|
96c16ca7f8
|
去掉log
|
2020-07-17 11:38:18 +08:00 |
zhangqiang
|
25896729ff
|
商店去掉刷新红点
|
2020-07-17 11:32:20 +08:00 |
zhangqiang
|
ebca764861
|
首冲
|
2020-07-17 11:27:03 +08:00 |
szxhzz
|
e95d071139
|
音频更新
|
2020-07-17 11:25:09 +08:00 |
jiaoyangna
|
adc5895d94
|
首充十级英雄属性天赋错误修改提交
|
2020-07-17 11:16:44 +08:00 |
jiaoyangna
|
3ae13a9762
|
首充英雄十级属性天赋修改提交
|
2020-07-17 11:14:07 +08:00 |
zhangqiang
|
897b14aa65
|
巅峰战提交
|
2020-07-17 10:28:02 +08:00 |
ZhangBiao
|
3f1c10f668
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 20:55:52 +08:00 |
ZhangBiao
|
bfe29c5601
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-07-16 20:55:34 +08:00 |
szxhzz
|
531a21608b
|
音频更新
|
2020-07-16 20:53:40 +08:00 |
ZhangBiao
|
3231f857af
|
工会祭祀援助红点、十绝阵排行修改
|
2020-07-16 20:53:17 +08:00 |
gaoxin
|
542c76916d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 20:43:23 +08:00 |
gaoxin
|
3152ff0f41
|
修复部分技能报错的问题
|
2020-07-16 20:43:11 +08:00 |
jiaoyangna
|
3ae65767d0
|
幸运探宝,
|
2020-07-16 20:36:54 +08:00 |
jiaoyangna
|
1838823c37
|
幸运探宝提交
|
2020-07-16 20:24:28 +08:00 |
JieLing
|
2be4cc20e6
|
Merge branch 'master_develop' into master_test
# Conflicts:
# .gitignore
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# data_execl/base_data/CombatControl.xlsx
# data_execl/base_data/GuideConfig.xlsx
|
2020-07-16 20:08:11 +08:00 |
gaoxin
|
1fbb30c1a8
|
登录服地址修改
|
2020-07-16 19:51:56 +08:00 |
gaoxin
|
7a7446f145
|
sdk可以正常登录了
|
2020-07-16 19:51:38 +08:00 |
szxhzz
|
663ff26d71
|
音频更新
|
2020-07-16 19:41:40 +08:00 |
jiaoyangna
|
47a1c94495
|
game_17
|
2020-07-16 18:45:58 +08:00 |
gongjiawei
|
c3f24ec725
|
音频更新
|
2020-07-16 18:20:25 +08:00 |
ZhangBiao
|
e36a85bcb2
|
充点小钱资源替换
|
2020-07-16 18:17:27 +08:00 |
gongjiawei
|
f087cec5d1
|
音频更新
|
2020-07-16 18:10:24 +08:00 |
zhangqiang
|
8f96d9f067
|
探宝红点
|
2020-07-16 18:01:03 +08:00 |
szxhzz
|
d24a82d574
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 17:35:27 +08:00 |
szxhzz
|
eb08bc7f57
|
音频更新
|
2020-07-16 17:34:31 +08:00 |
ZhangBiao
|
9e6416e0a1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 17:28:59 +08:00 |
ZhangBiao
|
a27c474098
|
协议
|
2020-07-16 17:28:48 +08:00 |
szxhzz
|
06e6b90d54
|
音频更新
|
2020-07-16 17:22:35 +08:00 |
gaoxin
|
5b7b28f1f9
|
sdk接入结构修改
|
2020-07-16 17:00:24 +08:00 |
ZhangBiao
|
0ee5c9dabe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 17:00:06 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
zhangqiang
|
864e3b739d
|
首冲
|
2020-07-16 16:57:36 +08:00 |
JieLing
|
abde9c93bf
|
casting音效播放添加
|
2020-07-16 16:52:43 +08:00 |
gongjiawei
|
9334944455
|
音频更新
|
2020-07-16 16:06:45 +08:00 |
zhangqiang
|
1aa78a2dd7
|
戴峰提交
|
2020-07-16 15:52:19 +08:00 |
gongjiawei
|
d770d288eb
|
音频更新
|
2020-07-16 15:46:00 +08:00 |
zhangqiang
|
85663ecfb4
|
首冲
|
2020-07-16 15:02:38 +08:00 |
szxhzz
|
045e07cff0
|
音频更新
|
2020-07-16 14:41:07 +08:00 |
zhangqiang
|
6fbed83b28
|
巅峰赛修改提交
|
2020-07-16 14:13:27 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
szxhzz
|
43f2a437a6
|
音频更新
|
2020-07-16 11:03:09 +08:00 |
jiaoyangna
|
c282e19b5e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 10:49:10 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
JieLing
|
9f6fa391c4
|
删除战斗音效加速的效果
|
2020-07-16 10:22:51 +08:00 |
zhangqiang
|
2c744690bc
|
赛程数据合并
|
2020-07-16 10:13:32 +08:00 |
gaoxin
|
8974820606
|
生成warp文件,修复本地运行时的错误
|
2020-07-15 19:15:00 +08:00 |
gongjiawei
|
b175124c6b
|
音频更新
|
2020-07-15 18:39:45 +08:00 |
zhangqiang
|
bdf9331b79
|
巅峰战提交
|
2020-07-15 18:23:40 +08:00 |
gongjiawei
|
f84d08ffeb
|
音频更新
|
2020-07-15 18:14:51 +08:00 |
gaoxin
|
037290c657
|
sdk工程加入猕猴桃sdk
|
2020-07-15 17:53:40 +08:00 |
ZhangBiao
|
cbe238fc9d
|
跳过战斗特权 修改
|
2020-07-15 17:33:19 +08:00 |
ZhangBiao
|
18c189cd0c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 16:36:52 +08:00 |
ZhangBiao
|
de9290e4a0
|
物品掉落特效+跳过按钮
|
2020-07-15 16:35:51 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
gongjiawei
|
cb7af0967b
|
音频更新
|
2020-07-15 16:19:11 +08:00 |
gongjiawei
|
deee98f641
|
音频更新
|
2020-07-15 15:48:00 +08:00 |
ZhangBiao
|
81f8a73de0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 15:03:30 +08:00 |
ZhangBiao
|
9497cfae78
|
bug修改
|
2020-07-15 15:03:23 +08:00 |
gongjiawei
|
5e229778e0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 14:54:49 +08:00 |
gongjiawei
|
dc5799c229
|
音频更新
|
2020-07-15 14:54:27 +08:00 |
ZhangBiao
|
fc4e2c35ff
|
bug修改
|
2020-07-15 14:50:00 +08:00 |
gaoxin
|
7605156317
|
sdk结构修改
|
2020-07-15 13:44:37 +08:00 |
ZhangBiao
|
9e23f56e00
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 13:41:44 +08:00 |
ZhangBiao
|
9f59d1f574
|
森罗幻境 小游戏与效果图的差异修改
|
2020-07-15 13:41:29 +08:00 |
zhangqiang
|
ed5a942875
|
探宝红点未完成
|
2020-07-15 13:34:13 +08:00 |
ZhangBiao
|
de81c1f5c2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-15 11:15:41 +08:00 |
ZhangBiao
|
10414deee5
|
领取挂机宝箱时,增加道具获取动画效果 修改
|
2020-07-15 11:15:29 +08:00 |
jiaoyangna
|
ee95a1ee55
|
【探宝优化】增加每日探宝次数限制
|
2020-07-15 11:07:32 +08:00 |
zhangqiang
|
b682f97e66
|
首充第一版修改
|
2020-07-15 10:36:57 +08:00 |
ZhangBiao
|
2ab6d17841
|
森罗小游戏修改
|
2020-07-14 21:03:44 +08:00 |
zhangqiang
|
f3048c9904
|
巅峰赛 修改
|
2020-07-14 20:27:23 +08:00 |
jiaoyangna
|
5a3e8f8b1b
|
乾坤宝盒红点显示
|
2020-07-16 09:02:59 +08:00 |
jiaoyangna
|
0d82750315
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 16:14:13 +08:00 |
jiaoyangna
|
1d9d318cb5
|
【限时召唤】只有第一次免费召唤有红点,刷新免费次数后,主城入口,限时召唤页签上不显示红点
|
2020-07-14 16:14:03 +08:00 |
zhangqiang
|
4968389a68
|
援助红点
|
2020-07-14 16:06:19 +08:00 |
jiaoyangna
|
f54529ce21
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 15:54:47 +08:00 |
jiaoyangna
|
798c730f56
|
公会红点显示,
|
2020-07-14 15:54:18 +08:00 |
zhangqiang
|
592d3385e8
|
129 战力计算
|
2020-07-14 14:49:15 +08:00 |
ZhangBiao
|
e9b2845315
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 14:03:20 +08:00 |
ZhangBiao
|
7785a7c472
|
神将生阶属性显示错误问题修复
|
2020-07-14 14:03:08 +08:00 |
jiaoyangna
|
15dd908ace
|
【ID1008354】
【公会祭祀】在原公会祭祀,加新公会,进度奖励不能领取,不需要显示红点
|
2020-07-14 13:55:41 +08:00 |
ZhangBiao
|
6d3faec09e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 11:43:46 +08:00 |
ZhangBiao
|
06e87b8c66
|
bug修改
|
2020-07-14 11:43:30 +08:00 |
gaoxin
|
59a9f073ac
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 11:40:01 +08:00 |
gaoxin
|
fb4891d005
|
修复打开关卡界面报错的问题
|
2020-07-14 11:39:56 +08:00 |
ZhangBiao
|
39bd3e8523
|
限时召唤ui调整
|
2020-07-14 11:34:40 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
zhangqiang
|
7d724437ee
|
巅峰战提示等待其他玩家战斗结束提交
|
2020-07-14 10:12:07 +08:00 |