ZhangBiao
|
1e3b3c9f27
|
【御剑行】修改提交
|
2021-10-20 18:31:59 +08:00 |
jiaoyangna
|
e420c89429
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:17:38 +08:00 |
jiaoyangna
|
f3f416e202
|
添加天书秘卷登陆请求
|
2021-10-20 15:17:22 +08:00 |
ZhangBiao
|
4299fdd035
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:10:09 +08:00 |
ZhangBiao
|
0d8af528ff
|
【主角修为】引导提交
|
2021-10-20 15:09:59 +08:00 |
jiaoyangna
|
dd89fb59e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:06:59 +08:00 |
jiaoyangna
|
9aa975cd7b
|
羁绊打印
|
2021-10-20 15:06:23 +08:00 |
ZhangBiao
|
e2cb67caf3
|
【修行】点击加成按钮后 游戏崩溃修改
|
2021-10-20 14:27:43 +08:00 |
gaoxin
|
32cabdd75c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 13:52:00 +08:00 |
gaoxin
|
74f3c07aa4
|
【山河每日奖励】新增二次确认
|
2021-10-20 13:51:55 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
jiaoyangna
|
7d1f1d7f01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 11:17:27 +08:00 |
xuexinpeng
|
0eaaf0fc77
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 19:07:25 +08:00 |
xuexinpeng
|
c1483a7438
|
玉虚论道 战斗记录添加空判断
|
2021-10-19 19:06:12 +08:00 |
gaoxin
|
e6af50143c
|
【山河社稷图】修复小人方向错误
|
2021-10-19 19:03:02 +08:00 |
ZhangBiao
|
a387432369
|
【主角修为】提交
|
2021-10-19 18:34:10 +08:00 |
gaoxin
|
7a9cdc15b2
|
Merge branch '0功能/山河社稷图每日奖励' into china/dev
|
2021-10-19 18:02:20 +08:00 |
gaoxin
|
e01b39c8a4
|
【山河每日奖励】优化宝箱显示
|
2021-10-19 18:01:50 +08:00 |
gaoxin
|
3c371623d7
|
【山河每日奖励】完善奖励领取逻辑
|
2021-10-19 17:07:32 +08:00 |
ZhangBiao
|
8f05e215fe
|
【我要变强】增加评分进度条显隐控制
|
2021-10-19 15:40:42 +08:00 |
ZhangBiao
|
2d982e67d3
|
【主角修为】提交
|
2021-10-19 15:34:43 +08:00 |
gaoxin
|
335bc04645
|
【每日豪礼】选中时也显示红点
|
2021-10-19 13:52:58 +08:00 |
jiaoyangna
|
2ec0a28cf3
|
去掉log
|
2021-10-19 13:34:03 +08:00 |
jiaoyangna
|
47a5fe6e3f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 13:25:21 +08:00 |
jiaoyangna
|
005468635f
|
页签添加红点
|
2021-10-19 13:25:08 +08:00 |
ZhangBiao
|
2f92759e9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:20:22 +08:00 |
ZhangBiao
|
db87d4925a
|
【灵兽山】放生10只整灵兽后,可以同时选择整只灵兽和碎片,恭送后消耗是正确的,仅显示问题
|
2021-10-19 11:20:11 +08:00 |
gaoxin
|
89d93783b7
|
【优化】每日豪礼充值以后没有红点提示领取
|
2021-10-19 11:08:35 +08:00 |
jiaoyangna
|
1f077cbcdc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:04:25 +08:00 |
jiaoyangna
|
c091c55bef
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-19 11:04:06 +08:00 |
gaoxin
|
a23791e07c
|
【战斗】失败界面添加我要变强跳转
|
2021-10-19 10:46:12 +08:00 |
ZhangBiao
|
48236ba797
|
【天枢密卷】增加跳转
|
2021-10-19 10:34:45 +08:00 |
ZhangBiao
|
47791f3711
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数(尝试修复)
|
2021-10-19 09:38:05 +08:00 |
ZhangBiao
|
f10cd9dc35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 09:33:51 +08:00 |
ZhangBiao
|
a9e430c755
|
【七界试炼】【优化】七界试炼优化上下层提示
|
2021-10-19 09:33:37 +08:00 |
gaoxin
|
11d5f735c7
|
【七界试炼】排行榜删除切磋和加入黑名单按钮
|
2021-10-18 21:06:01 +08:00 |
jiaoyangna
|
d3ca843ae5
|
罗浮争锋去掉log
|
2021-10-18 18:26:32 +08:00 |
jiaoyangna
|
fca015215c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 18:23:19 +08:00 |
jiaoyangna
|
f2e06a8bc4
|
罗浮争锋小人朝向错误修改
|
2021-10-18 18:23:06 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
ZhangBiao
|
cb3803a413
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-18 16:30:27 +08:00 |
ZhangBiao
|
bc7e316531
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 16:19:19 +08:00 |
ZhangBiao
|
1c137cc911
|
【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改
|
2021-10-18 16:18:59 +08:00 |
jiaoyangna
|
022a7f46c6
|
天书秘卷没有秘卷时滑动修改提交
|
2021-10-18 11:53:09 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
ZhangBiao
|
034d727a6f
|
【御剑行】提交
|
2021-10-18 11:32:06 +08:00 |
ZhangBiao
|
8f03ae0485
|
【御剑行】提交
|
2021-10-18 10:56:14 +08:00 |
wangzhenxing
|
35c1987c26
|
Merge branch '0功能/玉虚论道' into china/dev
|
2021-10-18 09:59:26 +08:00 |