jiaoyangna
|
b78b006009
|
神将情报界面修改提交
|
2021-05-28 12:30:47 +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 |
gaoxin
|
36240be7e9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-28 11:23:37 +08:00 |
gaoxin
|
c76af7fe0b
|
【左上角图标UI】六星玉帝图标没有置顶
|
2021-05-28 11:23:10 +08:00 |
wangzhenxing
|
2a21b80147
|
[限时祈愿]弹窗界面id修改
|
2021-05-28 11:05:50 +08:00 |
wangzhenxing
|
560089c1f5
|
[限时祈愿活动] 预设 协议提交
|
2021-05-28 10:58:20 +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
|
95b207e1eb
|
【每日礼包】一键购买点击无效
|
2021-05-27 22:24:28 +08:00 |
gaoxin
|
cf287eabda
|
【资源】重复资源删除
|
2021-05-27 22:12:08 +08:00 |
gaoxin
|
c9018a097f
|
【打包工具】修复只打包时不替换version文件的问题
|
2021-05-27 22:11:32 +08:00 |
gaoxin
|
a1df6cbcf5
|
【战斗】尝试修复竞技场战斗报错
|
2021-05-27 22:11:06 +08:00 |
jiaoyangna
|
8e22dc72eb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 20:49:41 +08:00 |
jiaoyangna
|
9ef020d022
|
重复资源修改提交
|
2021-05-27 20:49:35 +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 |
jiaoyangna
|
cb906bed77
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 20:19:29 +08:00 |
jiaoyangna
|
99d57b1497
|
怪物脚步声修改提交
|
2021-05-27 20:19:18 +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
|
916a777f59
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 18:30:56 +08:00 |
gaoxin
|
58aa9bce25
|
【嘿嘿】有个报错
|
2021-05-27 18:30:45 +08:00 |
ZhangBiao
|
4b2a71c6eb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 18:29:06 +08:00 |
ZhangBiao
|
dd29682429
|
【成长礼包】新换的会动的玉皇大帝,后面没背景
|
2021-05-27 18:28:49 +08:00 |
gaoxin
|
9f8858b4f7
|
【主界面】左上角按钮自动排列
|
2021-05-27 18:20:32 +08:00 |