wangzhenxing
|
10f97f9b8b
|
[许愿神将]===活动修改
|
2021-05-31 11:31:15 +08:00 |
gaoxin
|
1b366fb607
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 11:07:06 +08:00 |
gaoxin
|
92a04cc440
|
【抽卡】修复第一次抽卡报错的问题
|
2021-05-31 11:06:20 +08:00 |
jiaoyangna
|
7db0e3be54
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 10:47:02 +08:00 |
jiaoyangna
|
59c3bbf5ae
|
百宝 修改
|
2021-05-31 10:46:34 +08:00 |
gaoxin
|
928a64f435
|
【物品】添加一个碎片类型
|
2021-05-31 10:37:50 +08:00 |
ZhangBiao
|
df955dac39
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-31 10:28:32 +08:00 |
ZhangBiao
|
4f406045a6
|
【御兽斋】显示妖晶抽不足修改
|
2021-05-31 10:28:21 +08:00 |
zhangqiang
|
4ca111da25
|
【山河社稷图】数据修改
|
2021-05-29 23:14:16 +08:00 |
zhangqiang
|
2c27d19046
|
【关卡属性提升】修改提交
|
2021-05-29 22:49:43 +08:00 |
jiaoyangna
|
acfc98c16f
|
延续时间修改
|
2021-05-29 22:47:20 +08:00 |
jiaoyangna
|
b91e550147
|
百宝商会 提交
|
2021-05-29 22:16:50 +08:00 |
jiaoyangna
|
4898fb0ed7
|
百宝商会 修改提交
|
2021-05-29 21:56:10 +08:00 |
jiaoyangna
|
45307d2d3f
|
百宝商会提交
|
2021-05-29 21:42:41 +08:00 |
jiaoyangna
|
2666db8cf6
|
百宝商会修改提交
|
2021-05-29 21:31:39 +08:00 |
jiaoyangna
|
78f87d2b52
|
百宝商会 修改提交
|
2021-05-29 21:31:01 +08:00 |
zhangqiang
|
028a31941f
|
【背包】背包中道具详情没有“使用”按钮
|
2021-05-29 20:44:43 +08:00 |
wangzhenxing
|
b1fcc5d4e5
|
[限时活动,福利红包]=======bug修改
|
2021-05-29 20:36:26 +08:00 |
gaoxin
|
e1759216d2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 20:25:57 +08:00 |
gaoxin
|
6fbec8a36e
|
【森罗幻境】转盘小游戏修复抽中非物品时报错的问题
|
2021-05-29 20:25:52 +08:00 |
jiaoyangna
|
9eee295a1f
|
价格修改提交
|
2021-05-29 20:17:50 +08:00 |
jiaoyangna
|
e0089a98da
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 20:05:14 +08:00 |
jiaoyangna
|
b071e12e29
|
秘宝描述修改
|
2021-05-29 20:04:48 +08:00 |
ZhangBiao
|
19bce27f34
|
【修行】提交3
|
2021-05-29 19:58:52 +08:00 |
ZhangBiao
|
717b0039cb
|
【修行】印记提交2
|
2021-05-29 19:49:25 +08:00 |
ZhangBiao
|
62d78738ec
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 19:32:55 +08:00 |
ZhangBiao
|
1d4842a7d6
|
【修行】印记提交
|
2021-05-29 19:32:47 +08:00 |
gaoxin
|
41a923034d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 19:29:01 +08:00 |
gaoxin
|
90391d7255
|
【森罗幻境】转盘小游戏优化
|
2021-05-29 19:28:55 +08:00 |
ZhangBiao
|
749184a59a
|
【修行】提交
|
2021-05-29 19:22:35 +08:00 |
ZhangBiao
|
08b6f65f84
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 19:14:58 +08:00 |
ZhangBiao
|
4cfff84328
|
【修行】印记提交
|
2021-05-29 19:14:24 +08:00 |
jiaoyangna
|
6c5ab76379
|
無盡修改提交
|
2021-05-29 19:12:31 +08:00 |
jiaoyangna
|
ae03663c79
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 18:52:59 +08:00 |
jiaoyangna
|
4bc9e9ddd8
|
百寶提交
|
2021-05-29 18:52:42 +08:00 |
zhangqiang
|
f7be239ea7
|
【踏碎凌霄】排行榜
|
2021-05-29 18:37:45 +08:00 |
jiaoyangna
|
2b1356db5c
|
百寶商會
|
2021-05-29 18:36:27 +08:00 |
jiaoyangna
|
98b3a0caa2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 18:30:22 +08:00 |
jiaoyangna
|
14241e39df
|
無盡秘寶 提交
|
2021-05-29 18:29:50 +08:00 |
wangzhenxing
|
a7de414589
|
[限时抽卡活动] 抽卡优化,奖励展示修改
|
2021-05-29 18:27:03 +08:00 |
ZhangBiao
|
07582f1918
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 18:17:49 +08:00 |
ZhangBiao
|
2fbbc6a52a
|
【修行】层级问题解决
|
2021-05-29 18:17:41 +08:00 |
gaoxin
|
1ecbe01f06
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 18:14:50 +08:00 |
gaoxin
|
c15cf283ff
|
【跑马灯】修改跑马灯界面打开的位置
|
2021-05-29 18:14:11 +08:00 |
ZhangBiao
|
ef4b272880
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 18:06:24 +08:00 |
jiaoyangna
|
bff3c9b278
|
小游戲修改提交
|
2021-06-05 00:14:49 +07:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
jiaoyangna
|
4724c13023
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 16:34:20 +08:00 |
jiaoyangna
|
6a4d713949
|
無盡添加戰力
|
2021-05-29 16:34:00 +08:00 |
ZhangBiao
|
eb156ad3cd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 16:29:09 +08:00 |
ZhangBiao
|
43e24114c6
|
【幸运探宝】跑马灯bug修改
|
2021-05-29 16:28:59 +08:00 |
wangzhenxing
|
62f5514f80
|
[限时抽卡] 【公会福利红包】bug修改
|
2021-05-29 16:26:05 +08:00 |
zhangqiang
|
01edf58ee5
|
【隐藏踏碎凌霄排行按钮】
|
2021-05-29 16:12:47 +08:00 |
ZhangBiao
|
15051ea6f9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 15:40:02 +08:00 |
ZhangBiao
|
2a552d0730
|
【踏碎凌霄】引导增加活动是否开启检测
|
2021-05-29 15:39:21 +08:00 |
wangzhenxing
|
b49fcce742
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 15:37:09 +08:00 |
wangzhenxing
|
574d95b607
|
[限时祈愿活动]======修改bug提交
|
2021-05-29 15:35:52 +08:00 |
gaoxin
|
1ea3890111
|
【战斗】报错优化
|
2021-05-29 15:21:41 +08:00 |
jiaoyangna
|
7149c17aef
|
小游戲加載圖片修改
|
2021-05-29 15:19:35 +08:00 |
zhangqiang
|
4b289f571b
|
【关卡属性提升界面修改】
|
2021-05-29 15:06:16 +08:00 |
wangzhenxing
|
ee90abf1b4
|
【公会】========加入宗门报错修改提交
|
2021-05-28 19:41:43 +08:00 |
jiaoyangna
|
a694f95bac
|
森罗幻境】小游戏卡死
|
2021-05-28 19:25:43 +08:00 |
jiaoyangna
|
876322a315
|
【限时兑换】人物名称标识调整
|
2021-05-28 19:16:43 +08:00 |
jiaoyangna
|
f6d701fc6a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 18:53:57 +08:00 |
jiaoyangna
|
fb8db45fda
|
百宝商会修改提交
|
2021-05-28 18:53:54 +08:00 |
zhangqiang
|
cb7a727901
|
【踏碎凌霄】排行榜
|
2021-05-28 18:26:01 +08:00 |
wangzhenxing
|
53cbc08d48
|
[限时祈愿]=============抽卡修改
|
2021-05-28 16:54:40 +08:00 |
jiaoyangna
|
e63200f4a2
|
预设修改提交
|
2021-05-28 16:26:12 +08:00 |
jiaoyangna
|
9e6c8248df
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 16:22:15 +08:00 |
jiaoyangna
|
9be6ae227a
|
小游戏 修改提交
|
2021-05-28 16:22:04 +08:00 |
ZhangBiao
|
aaf98b4cf0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 16:20:26 +08:00 |
ZhangBiao
|
ea4662a447
|
【福星高照】bug修复
|
2021-05-28 16:20:14 +08:00 |
jiaoyangna
|
60903eb982
|
活动修改提交
|
2021-05-28 16:19:20 +08:00 |
jiaoyangna
|
cc081e68d9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 16:10:54 +08:00 |
jiaoyangna
|
68d39a1d5e
|
森罗修改提交
|
2021-05-28 16:10:44 +08:00 |
gaoxin
|
74d2dcfcbf
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 16:03:12 +08:00 |
gaoxin
|
9c0de19fd0
|
【注释】接口描述优化
|
2021-05-28 16:02:47 +08:00 |
jiaoyangna
|
d165c87724
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-05-28 16:01:35 +08:00 |
jiaoyangna
|
7a104f9ff7
|
【主题活动累充】累充图标白篇且奖励间距不对
|
2021-05-28 16:01:03 +08:00 |
zhangqiang
|
78ece97bfd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:54:30 +08:00 |
zhangqiang
|
1dc1ad1db1
|
【幸运探宝】加标签
|
2021-05-28 15:54:20 +08:00 |
ZhangBiao
|
a7f4b320d7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:35:11 +08:00 |
ZhangBiao
|
3c67b0b8f3
|
【主城】icon问题调整
|
2021-05-28 15:35:02 +08:00 |
gaoxin
|
9e06f1994d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:20:35 +08:00 |
gaoxin
|
51d04d5526
|
【每日豪礼】修复红点不消失的问题
|
2021-05-28 15:20:22 +08:00 |
ZhangBiao
|
5bd86d81fe
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:12:07 +08:00 |
ZhangBiao
|
4af21bc33d
|
【幸运探宝】进度条奖励包装显示修改
|
2021-05-28 15:11:57 +08:00 |
wangzhenxing
|
2526371970
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:09:29 +08:00 |
wangzhenxing
|
510b2460ea
|
[限时祈愿] 活动奖励界面提交
|
2021-05-28 15:09:18 +08:00 |
jiaoyangna
|
d69164dd42
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 15:02:50 +08:00 |
jiaoyangna
|
33909a2f91
|
【旗开得胜】社稷赏商店购买限购商品到达上限后,页面不限时已售空,需要切换页签。
|
2021-05-28 15:02:17 +08:00 |
zhangqiang
|
9a4f1a64b2
|
【漏提】
|
2021-05-28 15:01:18 +08:00 |
jiaoyangna
|
edd52b5eaa
|
【无尽副本】体力刷新倒计时结束后,页面计时显示不重置,退出重进显示正常
|
2021-05-28 14:45:42 +08:00 |
jiaoyangna
|
86e49bb7c0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 14:43:31 +08:00 |
jiaoyangna
|
1c7046260b
|
无尽新手引导
|
2021-05-28 14:43:27 +08:00 |
gaoxin
|
1e36398a50
|
【内存优化】Util.Loadsprite 替换为 spLoader
|
2021-05-28 14:41:58 +08:00 |
gaoxin
|
9cce82f017
|
【SpriteLoader】修改初始化位置,兼容老包
|
2021-05-28 14:34:01 +08:00 |
gaoxin
|
e0b0140609
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 14:32:49 +08:00 |
gaoxin
|
41fbecb79a
|
【优化】修复界面销毁后计时器报错
|
2021-05-28 14:32:42 +08:00 |
zhangqiang
|
63671cacbb
|
【修改图片加载方式 】 增加踏碎凌霄称号预设 没特效
|
2021-05-28 14:18:41 +08:00 |
zhangqiang
|
8dbf142b74
|
【踏碎凌霄】排行榜添加
|
2021-05-28 14:05:17 +08:00 |
zhangqiang
|
ffed262485
|
【bug】
|
2021-05-28 13:48:43 +08:00 |
gaoxin
|
f1b5b0a97f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 13:31:11 +08:00 |
gaoxin
|
593a8cb398
|
【山河社稷图】猪八戒普攻后半身像显示不全
|
2021-05-28 13:31:06 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
jiaoyangna
|
8e1d427e2a
|
属性修改提交
|
2021-05-28 11:43:14 +08:00 |
jiaoyangna
|
f76005afb7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 11:29:31 +08:00 |
jiaoyangna
|
81761b26af
|
无尽修改提交
|
2021-05-28 11:29:27 +08:00 |
wangzhenxing
|
2a21b80147
|
[限时祈愿]弹窗界面id修改
|
2021-05-28 11:05:50 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
jiaoyangna
|
5c3c32be15
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 10:35:13 +08:00 |
jiaoyangna
|
d9773587a5
|
修改提交
|
2021-05-28 10:35:01 +08:00 |
ZhangBiao
|
6adde33bf8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 10:34:00 +08:00 |
ZhangBiao
|
458ab29053
|
【清除Log】清楚部分Log
|
2021-05-28 10:33:53 +08:00 |
zhangqiang
|
fe6b69bfe6
|
【bug】提交
|
2021-05-28 10:32:42 +08:00 |
jiaoyangna
|
4b33fee287
|
红点修改提交
|
2021-05-28 10:20:13 +08:00 |
jiaoyangna
|
f2c557c66e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 09:55:52 +08:00 |
jiaoyangna
|
89c667d314
|
无尽红点修改提交
|
2021-05-28 09:55:48 +08:00 |
gaoxin
|
613434d1fd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 23:33:08 +08:00 |
gaoxin
|
33efb7bc2a
|
【修行】亢龙有悔,东陵圣母大招没有眩晕敌方,没回怒
【修行】亢龙有悔神印,达摩连续追击,连续没眩晕,只第一次回了怒
|
2021-05-27 23:33:03 +08:00 |
zhangqiang
|
4bfbd360dd
|
【山河社稷图】特效层级调整
|
2021-05-27 23:20:09 +08:00 |
zhangqiang
|
9922678210
|
【山河社稷图】开启章节界面修改
|
2021-05-27 23:09:37 +08:00 |
jiaoyangna
|
cde2379d78
|
常量重复修改
|
2021-05-27 22:43:50 +08:00 |
jiaoyangna
|
765d58f459
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 22:34:15 +08:00 |
jiaoyangna
|
a996bbc219
|
无尽修改提交
|
2021-05-27 22:34:11 +08:00 |
gaoxin
|
a1df6cbcf5
|
【战斗】尝试修复竞技场战斗报错
|
2021-05-27 22:11:06 +08:00 |
gaoxin
|
38e4008d81
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 20:45:26 +08:00 |
gaoxin
|
f5071a9845
|
【bug】修复战斗结算报错,修复挂机奖励提升白片
|
2021-05-27 20:45:20 +08:00 |
zhangqiang
|
0b2ef33938
|
【山河社稷图】特效修改提交
|
2021-05-27 20:29:05 +08:00 |
gaoxin
|
89c2517cc7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 20:24:58 +08:00 |
gaoxin
|
d0b8f8db8e
|
【bug】修复报错
|
2021-05-27 20:24:33 +08:00 |
jiaoyangna
|
d9c94e250f
|
删除log
|
2021-05-27 20:24:10 +08:00 |
zhangqiang
|
b92e659e53
|
【山河社稷图】特效提交
|
2021-05-27 20:17:53 +08:00 |
ZhangBiao
|
4b54176492
|
【协议提交】
|
2021-05-27 20:08:32 +08:00 |
ZhangBiao
|
b0226b664f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 19:55:10 +08:00 |
ZhangBiao
|
13b222d998
|
【每日豪礼】可领取,没红点
|
2021-05-27 19:54:54 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
jiaoyangna
|
20f117702c
|
无尽副本修改提交
|
2021-05-27 18:37:51 +08:00 |
gaoxin
|
58aa9bce25
|
【嘿嘿】有个报错
|
2021-05-27 18:30:45 +08:00 |
gaoxin
|
9f8858b4f7
|
【主界面】左上角按钮自动排列
|
2021-05-27 18:20:32 +08:00 |
gaoxin
|
8ebd47a087
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 18:13:08 +08:00 |
gaoxin
|
ba4debba7b
|
【主界面】左上角按钮自动排列
|
2021-05-27 18:13:03 +08:00 |
jiaoyangna
|
b1cf308eeb
|
无尽修改提交
|
2021-05-27 18:08:26 +08:00 |
ZhangBiao
|
45602214d8
|
【修行】特效增加
|
2021-05-27 17:57:49 +08:00 |
ZhangBiao
|
b5fa65a2fa
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 17:41:15 +08:00 |
ZhangBiao
|
b417d4eaa4
|
【修行】特效导入
|
2021-05-27 17:40:54 +08:00 |
gaoxin
|
21208dcf58
|
【挂机】金钱特效报错
|
2021-05-27 17:39:36 +08:00 |
jiaoyangna
|
666f77c3db
|
无尽修改提交
|
2021-05-27 17:34:59 +08:00 |
gaoxin
|
8bdf3b73bd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 16:53:10 +08:00 |