gaoxin
|
7dede46133
|
【version】不再保存到resources路径
|
2021-05-26 13:43:49 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
gaoxin
|
0583113fb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 13:40:30 +08:00 |
gaoxin
|
4d934cc63c
|
【GM】位置移动
|
2021-05-26 13:40:08 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
ZhangBiao
|
51576888a2
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 11:53:54 +08:00 |
ZhangBiao
|
5155b4aeb3
|
【主界面】提交
|
2021-05-26 11:53:45 +08:00 |
jiaoyangna
|
e3c4ac2440
|
无尽副本战力修改提交
|
2021-05-26 11:52:32 +08:00 |
zhangqiang
|
da9aeed441
|
【心魔试炼】提交
|
2021-05-26 11:48:44 +08:00 |
ZhangBiao
|
172f98c207
|
【修行】玩家界面预览报错修改
|
2021-05-26 11:28:59 +08:00 |
ZhangBiao
|
d7cda43ed0
|
【主界面】右上伸缩条调整
|
2021-05-26 11:16:27 +08:00 |
ZhangBiao
|
bd1417f9aa
|
【修行】引导包修改
|
2021-05-26 10:42:19 +08:00 |
jiaoyangna
|
06f4a3be80
|
无尽副本界面修改
|
2021-05-26 10:29:34 +08:00 |
ZhangBiao
|
a47268aa88
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 10:16:33 +08:00 |
ZhangBiao
|
f3cf294f42
|
【主界面】右上伸缩条首充引导调整,修行调整
|
2021-05-26 10:16:24 +08:00 |
zhangqiang
|
f8ddf0fbe6
|
【心魔试炼】提交
|
2021-05-26 10:00:30 +08:00 |
jiaoyangna
|
5ae6e53b49
|
士气等级提升图片提交
|
2021-05-26 09:59:28 +08:00 |
zhangqiang
|
281e19ad74
|
【心魔试炼】一键
|
2021-05-26 09:53:41 +08:00 |
jiaoyangna
|
911f443e40
|
添加属性提升
|
2021-05-26 09:51:41 +08:00 |
jiaoyangna
|
3846170f2d
|
属性提升界面修改提交
|
2021-05-25 21:40:41 +08:00 |
jiaoyangna
|
82787b2331
|
无尽编队修改
|
2021-05-25 21:27:38 +08:00 |
ZhangBiao
|
f38620058c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 21:09:43 +08:00 |
ZhangBiao
|
9e6dc29cb9
|
【主界面】右上伸缩条红点
|
2021-05-25 21:08:48 +08:00 |
zhangqiang
|
7353ddd09a
|
【心魔试炼】一键购买
|
2021-05-25 21:04:58 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
ZhangBiao
|
8d4d1aa777
|
【修行】第二短引导
|
2021-05-25 20:39:37 +08:00 |
jiaoyangna
|
da6dd0283c
|
编队修改提交
|
2021-05-25 20:37:12 +08:00 |
ZhangBiao
|
d835687e8c
|
【主城】伸缩条调整
|
2021-05-25 18:33:26 +08:00 |
ZhangBiao
|
d41ba9f65d
|
【主城】右侧伸缩条
|
2021-05-25 18:21:52 +08:00 |
jiaoyangna
|
a112127db0
|
无尽副本修改提交
|
2021-05-25 18:07:53 +08:00 |
jiaoyangna
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
ZhangBiao
|
d09ff174d2
|
【修行】取消玩家信息界面神印神将头像,练气期预览报错修改
|
2021-05-25 15:50:41 +08:00 |
ZhangBiao
|
1ab094facb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 15:00:07 +08:00 |
ZhangBiao
|
d00e5f99a7
|
【修行】神印界面调整
|
2021-05-25 14:59:59 +08:00 |
zhangqiang
|
1848a666e9
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 14:53:41 +08:00 |
wangzhenxing
|
69d0f3ab39
|
公会福利红包修改提交
|
2021-05-25 14:52:02 +08:00 |
zhangqiang
|
dfa198081a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 14:51:58 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
ZhangBiao
|
42b6dd4d7a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:54:32 +08:00 |
ZhangBiao
|
41152acae9
|
【修行】排行榜界面,神将界面、神将替换提示调整
|
2021-05-25 11:54:19 +08:00 |
jiaoyangna
|
80691b1a9e
|
限购次数修改提交
(cherry picked from commit f7235b087b)
|
2021-05-25 11:33:52 +08:00 |
jiaoyangna
|
f7235b087b
|
限购次数修改提交
|
2021-05-25 11:22:30 +08:00 |
wangzhenxing
|
32b28f03eb
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:15:04 +08:00 |
wangzhenxing
|
1e82024f29
|
添加弹窗类型
|
2021-05-25 11:14:50 +08:00 |
ZhangBiao
|
e3a45d34b5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 11:06:29 +08:00 |
ZhangBiao
|
1e2a932096
|
【修行预览、神将信息】
|
2021-05-25 11:06:20 +08:00 |
jiaoyangna
|
4a5dc61add
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:32:54 +08:00 |
jiaoyangna
|
bec733c9d6
|
预设提交
|
2021-05-25 10:32:42 +08:00 |
gaoxin
|
289a75c741
|
【挂机】修复挂机帮助和vip任务重叠的问题
|
2021-05-25 10:31:44 +08:00 |
gaoxin
|
6a49d684e0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:30:47 +08:00 |
jiaoyangna
|
5ceb07ca7d
|
删除图片提交
|
2021-05-25 10:30:32 +08:00 |
gaoxin
|
e7c8d5290d
|
【仙缘抽】修复报错
|
2021-05-25 10:30:18 +08:00 |
jiaoyangna
|
919294b575
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:28:32 +08:00 |
jiaoyangna
|
e12700bfa2
|
图片提交
|
2021-05-25 10:28:16 +08:00 |
ZhangBiao
|
a22a984c61
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:16:17 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
jiaoyangna
|
5f9b35a66c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-25 10:07:42 +08:00 |
jiaoyangna
|
c9c5480484
|
福星高照 提交
|
2021-05-25 10:07:31 +08:00 |
gaoxin
|
caa32bac70
|
【红包】消息删除空格
|
2021-05-25 10:00:42 +08:00 |
gaoxin
|
bfbc185604
|
【抽卡】仙缘汇聚箱加入山河社稷图星数条件
|
2021-05-24 20:33:26 +08:00 |
jiaoyangna
|
40fcabaf55
|
牛气冲天 提交
|
2021-05-24 20:26:53 +08:00 |
jiaoyangna
|
4452bb1d9a
|
音效提交
|
2021-05-24 20:22:38 +08:00 |
jiaoyangna
|
1d11aeb1b0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 19:50:38 +08:00 |
jiaoyangna
|
b36d04f7d7
|
牛气冲天 修改
|
2021-05-24 19:50:21 +08:00 |
gaoxin
|
23001be1b4
|
【战斗】跳过优化
|
2021-05-24 19:20:22 +08:00 |
wangzhenxing
|
31a58128c1
|
退出公会黑屏bug修改
|
2021-05-24 18:27:13 +08:00 |
zhangqiang
|
b728d3a396
|
【t3资源漏提】
|
2021-05-24 17:01:04 +08:00 |
gaoxin
|
563587e640
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 16:58:31 +08:00 |
gaoxin
|
24498b21a9
|
【公会】成员信息界面报错修复
|
2021-05-24 16:58:26 +08:00 |
ZhangBiao
|
6294f34149
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 16:38:41 +08:00 |
ZhangBiao
|
43a817235f
|
【修行】英雄选择附身中
|
2021-05-24 16:38:30 +08:00 |
gaoxin
|
e308fd0149
|
【主界面】修复update方法不能停止的问题
|
2021-05-24 16:24:16 +08:00 |
gaoxin
|
6d9f8f2f3d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 15:44:17 +08:00 |
gaoxin
|
d37728e374
|
【配置】修复公告兑换码不显示的问题
|
2021-05-24 15:44:10 +08:00 |
zhangqiang
|
41bf14a6ad
|
【山河社稷图】GM
|
2021-05-24 15:19:25 +08:00 |
jiaoyangna
|
6e90a19270
|
协议提交
|
2021-05-24 15:02:57 +08:00 |
jiaoyangna
|
34fd873ac4
|
修改提交
|
2021-05-24 15:00:38 +08:00 |
ZhangBiao
|
0332366e9d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 14:58:09 +08:00 |
ZhangBiao
|
6f27423920
|
【修行】提交
|
2021-05-24 14:58:00 +08:00 |
jiaoyangna
|
c68da98b84
|
Merge branch 'china/dev-c' into 0优化/无尽副本
|
2021-05-24 14:43:42 +08:00 |
jiaoyangna
|
1f914e4ae9
|
预设提交
|
2021-05-24 14:40:54 +08:00 |
gaoxin
|
4cc4bc87aa
|
【本地化】公告
|
2021-05-24 14:18:37 +08:00 |
gaoxin
|
4c02ba25cd
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 14:16:52 +08:00 |
gaoxin
|
0f18eaf86c
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
# Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
|
2021-05-24 14:15:30 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
gaoxin
|
acc2609df6
|
【本地化】公告
|
2021-05-24 14:09:11 +08:00 |
ZhangBiao
|
fa051b65dc
|
【修行】QA增加
|
2021-05-24 13:58:30 +08:00 |
jiaoyangna
|
c22e26a5f5
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
|
2021-05-24 13:53:28 +08:00 |
ZhangBiao
|
04140ca1f2
|
【修行】神印按钮条件
|
2021-05-24 13:48:07 +08:00 |
ZhangBiao
|
d9b465c7cf
|
【修行】英雄选择界面修改
|
2021-05-24 12:02:20 +08:00 |
ZhangBiao
|
dade783281
|
【修行】英雄选择界面修改
|
2021-05-24 11:53:44 +08:00 |
jiaoyangna
|
a10ec722e5
|
无尽副本提交
|
2021-05-24 11:51:11 +08:00 |
wangzhenxing
|
d8bfab9427
|
称号 超凡入圣 图片特效贴图修改
|
2021-05-24 11:38:01 +08:00 |
DESKTOP-98AVA47\Administrator
|
2c870933d5
|
【充值】删除充值界面的文字显示
|
2021-06-03 00:31:34 +08:00 |
ZhangBiao
|
040f83f370
|
【修行】红点调整
|
2021-05-24 11:34:50 +08:00 |
ZhangBiao
|
82a0370730
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-24 11:22:07 +08:00 |
ZhangBiao
|
70729ca2d0
|
【修行】增加红点
|
2021-05-24 11:21:56 +08:00 |
wangzhenxing
|
368f6b7b64
|
超凡入圣称号特效贴图修改提交
|
2021-05-24 11:17:44 +08:00 |
jiaoyangna
|
4ced80cf6a
|
福星高照,牛气冲天 提交
|
2021-05-24 11:08:16 +08:00 |
ZhangBiao
|
daf5a675f8
|
【修行】预览界面资源添加
|
2021-05-22 18:52:49 +08:00 |
ZhangBiao
|
b64e85bc2c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-22 18:20:14 +08:00 |
ZhangBiao
|
165ad7a2de
|
【修行】提交
|
2021-05-22 18:20:07 +08:00 |
zhangqiang
|
29622ac19a
|
【英雄小头像替换】
|
2021-05-22 17:58:47 +08:00 |
jiaoyangna
|
3bd06ba84b
|
【主题活动】活动商店背景图不正确,需要统一,类似社稷大典或乾坤宝盒商店这些商店等。
|
2021-05-22 17:17:43 +08:00 |
jiaoyangna
|
f3e48f1d38
|
牛气冲天按钮提交
|
2021-05-22 17:10:16 +08:00 |
zhangqiang
|
e404e26ffa
|
【山河社稷图】
|
2021-05-22 15:55:14 +08:00 |
zhangqiang
|
a30616a9fc
|
【山河社稷图】修改
|
2021-05-22 15:26:30 +08:00 |
jiaoyangna
|
8719603f64
|
牛气冲天,福星高照修改
|
2021-05-22 15:20:51 +08:00 |
wangzhenxing
|
1478142476
|
称号资源替换提交
|
2021-05-22 15:02:09 +08:00 |
jiaoyangna
|
7cc12e74a8
|
无尽修改提交
|
2021-05-22 14:08:34 +08:00 |
zhangqiang
|
cb86e3efd4
|
【山河社稷图】
|
2021-05-21 19:07:46 +08:00 |
wangzhenxing
|
d95768226b
|
红包红点显示修改
|
2021-05-21 18:18:53 +08:00 |
wangzhenxing
|
9b336aeda9
|
主城报错修改提交
|
2021-05-21 18:13:21 +08:00 |
wangzhenxing
|
cade21c700
|
主城报错修改提交
|
2021-05-21 18:00:25 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
zhangqiang
|
016667ef7e
|
【战斗背景音乐】 山河社稷图入口文字
|
2021-05-21 16:38:20 +08:00 |
zhangqiang
|
d2a53631d6
|
【山河社稷图】提交
|
2021-05-21 16:21:07 +08:00 |
gaoxin
|
24e02b07c6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-21 15:31:48 +08:00 |
gaoxin
|
f6067f4402
|
【战斗】跳过优化
|
2021-05-21 15:31:40 +08:00 |
zhangqiang
|
4aaa6b29de
|
【山河社稷图】入口 + 特权修改
|
2021-05-21 15:29:14 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
zhangqiang
|
1ed6cbaad0
|
【山河社稷图】替换新资源
|
2021-05-21 14:37:09 +08:00 |
gaoxin
|
f15fbf6576
|
【探宝】物品置灰后不再显示光效
|
2021-05-21 14:14:09 +08:00 |
gaoxin
|
5f77a01928
|
【meta】
|
2021-05-21 13:56:58 +08:00 |
gaoxin
|
3f59300826
|
【挂机】修复vip任务刷新不及时的问题
|
2021-05-21 13:55:40 +08:00 |
gaoxin
|
006eae4bd9
|
【死灵试炼】资源及相关代码导入,但代码未使用
|
2021-05-21 13:45:10 +08:00 |
gaoxin
|
a8c8d08775
|
【挂机】优化挂机界面vip任务显示
|
2021-05-21 11:57:59 +08:00 |
gaoxin
|
d89511a3d9
|
【跳转】资源条添加碎繁星辰跳转
|
2021-05-21 11:02:24 +08:00 |
gaoxin
|
e72d1ee9c0
|
【挂机】优化跳转
|
2021-05-21 11:01:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
361c3549be
|
【山河社稷图】提交zq
|
2021-05-21 04:52:04 +08:00 |
gaoxin
|
aecc6eb692
|
【特权优化】特权任务在关卡界面增加快捷入口
|
2021-05-20 21:00:29 +08:00 |
zhangqiang
|
da17fb96ed
|
【主城修改】2
|
2021-05-20 20:32:04 +08:00 |
zhangqiang
|
2d4ecc8c04
|
Merge branch 'china/dev-c' into china/mainSceneChange
|
2021-05-20 20:29:41 +08:00 |
ZhangBiao
|
abcc89c68f
|
【修行】选择神将从generalpopup到bigpopup
|
2021-05-20 20:23:22 +08:00 |
ZhangBiao
|
7f19809419
|
【修行】提交
|
2021-05-20 20:12:01 +08:00 |
ZhangBiao
|
e51378ab3b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 18:00:53 +08:00 |
ZhangBiao
|
46cc1d9591
|
【修行】限制特权入口,增加仙尘加号
|
2021-05-20 18:00:45 +08:00 |
zhangqiang
|
02b3f94761
|
【首领关卡】不允许跳过提示修改
|
2021-05-20 17:50:44 +08:00 |
ZhangBiao
|
b22b8abd6a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 17:38:07 +08:00 |
ZhangBiao
|
b1e7cd1164
|
【修行】提交
|
2021-05-20 17:37:56 +08:00 |
zhangqiang
|
97ba718ac2
|
Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-05-20 17:32:06 +08:00 |
gaoxin
|
243240d803
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:51:34 +08:00 |
gaoxin
|
239f8c50e4
|
【社稷大典】奖励提示添加
|
2021-05-20 16:51:09 +08:00 |
zhangqiang
|
4b2259d65a
|
【山河社稷图】加副关卡编队
|
2021-05-20 16:46:26 +08:00 |
gaoxin
|
6f0132e18d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:12:20 +08:00 |
gaoxin
|
bd27d190ac
|
【屏幕适配】部分界面优化
|
2021-05-20 16:12:15 +08:00 |
zhangqiang
|
fc1dc60119
|
【特权加等级奖励】4
|
2021-05-20 16:11:18 +08:00 |
zhangqiang
|
90bba41910
|
【特权加等级奖励】3
|
2021-05-20 15:47:15 +08:00 |
gaoxin
|
16596f733d
|
【竞技场】免费次数提示添加
|
2021-05-20 14:59:40 +08:00 |
gaoxin
|
3007dafa27
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 14:37:05 +08:00 |
gaoxin
|
0bc7a1d3e8
|
【资源】修复新增spine动画的动作问题
|
2021-05-20 14:36:40 +08:00 |
zhangqiang
|
ede26383c8
|
【特权加等级奖励】2
|
2021-05-20 14:19:29 +08:00 |
zhangqiang
|
80183cd5a0
|
【特权加等级奖励】1
|
2021-05-20 14:18:48 +08:00 |
ZhangBiao
|
ae10b715cd
|
【修行】神印界面提交
|
2021-05-20 11:57:27 +08:00 |
ZhangBiao
|
40cafcca32
|
【修行】神印界面结构修改
|
2021-05-20 11:18:42 +08:00 |
ZhangBiao
|
e416d30107
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 10:55:48 +08:00 |
ZhangBiao
|
5ea5e5b689
|
【修行】紫府神印界面添加资源
|
2021-05-20 10:55:33 +08:00 |
gaoxin
|
f67e673401
|
【资源】立绘提交
|
2021-05-20 10:19:09 +08:00 |
ZhangBiao
|
3f7e243b70
|
【修行】this.spLoader提交
|
2021-05-20 09:48:52 +08:00 |
ZhangBiao
|
2870091514
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-19 20:53:37 +08:00 |
ZhangBiao
|
098ab986e4
|
【修行】meta提交
|
2021-05-19 20:43:16 +08:00 |
zhangqiang
|
189ed98688
|
【拍脸灵兽推送礼包】
|
2021-05-19 20:40:33 +08:00 |
jiaoyangna
|
981d945ece
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 20:28:24 +08:00 |
gaoxin
|
11c0d5f2a5
|
【引导】修复不明原因引导小手消失的问题
|
2021-05-19 20:21:07 +08:00 |
ZhangBiao
|
be1085d2bb
|
Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
|
2021-05-19 20:01:57 +08:00 |
ZhangBiao
|
00cdcffd23
|
【修行】图片meta提交
|
2021-05-19 19:55:02 +08:00 |
ZhangBiao
|
a93b2391e6
|
【修行】提交
|
2021-05-19 19:53:00 +08:00 |
gaoxin
|
00d42ca8d9
|
【本地化】导出lua文本时,不再对没有变化的文件进行写操作
|
2021-05-19 19:47:39 +08:00 |
gaoxin
|
ab4baa0420
|
【meta】
|
2021-05-19 19:46:52 +08:00 |
ZhangBiao
|
7d5de9d23a
|
【修行】恭喜破镜
|
2021-05-19 18:27:57 +08:00 |
gaoxin
|
e205ee9a7c
|
【踏碎凌霄】背景资源类型修改
|
2021-05-19 17:55:57 +08:00 |
gaoxin
|
0b11346906
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 17:51:44 +08:00 |
gaoxin
|
17d453dd51
|
【乾坤商店】修复消耗品显示白片的问题
|
2021-05-19 17:51:40 +08:00 |
jiaoyangna
|
2020d3aa18
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 17:41:03 +08:00 |
jiaoyangna
|
e295c16960
|
图片提交
|
2021-05-19 17:40:01 +08:00 |
zhangqiang
|
029ea47266
|
【山河社稷图】图片加载
|
2021-05-19 17:36:43 +08:00 |
gaoxin
|
417dcbf116
|
【bug】修复幸运探宝界面打不开的wenti
|
2021-05-19 17:26:50 +08:00 |
gaoxin
|
30372368f6
|
【资源】特惠商城资源格式修改
|
2021-05-19 17:11:37 +08:00 |
ZhangBiao
|
3bb85fd5db
|
【修行】新增通用恭喜界面
|
2021-05-19 16:56:49 +08:00 |
ZhangBiao
|
e491f58adc
|
【修行】提交
|
2021-05-19 16:14:09 +08:00 |
gaoxin
|
a092534a16
|
【工具】图片整理工具优化
|
2021-05-19 16:06:43 +08:00 |
gaoxin
|
5f7aaf6a57
|
【公告】修复界面销毁后再打开报错的问题
|
2021-05-19 16:05:29 +08:00 |
zhangqiang
|
ebcc753925
|
【山河社稷图】小关卡等级限制提示
|
2021-05-19 15:53:23 +08:00 |
gaoxin
|
a856603686
|
【降妖夺宝】修复图片加载器错误
|
2021-05-19 15:24:14 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
zhangqiang
|
6bc086b567
|
Revert "【山河社稷图】小关卡等级限制提示修改"
This reverts commit 9fe2d0c567.
|
2021-05-19 14:53:18 +08:00 |
zhangqiang
|
9fe2d0c567
|
【山河社稷图】小关卡等级限制提示修改
|
2021-05-19 14:52:09 +08:00 |
ZhangBiao
|
d2e6f593be
|
【修行】小点提交
|
2021-05-19 14:46:51 +08:00 |
gaoxin
|
d84db1977d
|
【优化】删除一些log,修复一些合并代码产生的错误
|
2021-05-19 14:37:08 +08:00 |
gaoxin
|
73f476a4e8
|
【资源】重复资源删除
|
2021-05-19 14:26:37 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
jiaoyangna
|
7a1894e75e
|
累计充值修改提交
|
2021-05-19 10:56:30 +08:00 |
jiaoyangna
|
ac622ed41d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-19 10:31:03 +08:00 |
jiaoyangna
|
bb6147ca6f
|
每日累计充值。转盘提交
|
2021-05-19 10:30:50 +08:00 |
zhangqiang
|
491b7b54a7
|
【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示
|
2021-05-19 10:27:55 +08:00 |
ZhangBiao
|
916f5af5c8
|
【修行】资源调整
|
2021-05-19 10:23:39 +08:00 |
jiaoyangna
|
15c655cbf5
|
日常副本提交
|
2021-05-19 09:55:28 +08:00 |
jiaoyangna
|
a8f3377bc3
|
删除log
|
2021-05-18 21:15:18 +08:00 |
jiaoyangna
|
3cf21f5e85
|
30、68元档位奖励图标及特效框需同时出现,效果同首次点击18元档位展示效果即可
|
2021-05-18 21:14:22 +08:00 |
jiaoyangna
|
deeaa0221d
|
每日礼包界面内,点击妖晶快捷获取按钮,再点击商店,商店内点击妖晶快捷获取,退出时会重复显示界面的bug;
|
2021-05-18 21:04:58 +08:00 |
ZhangBiao
|
9b1c6ac930
|
【修行】资源提交
|
2021-05-18 21:00:38 +08:00 |
jiaoyangna
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
jiaoyangna
|
b6b5599812
|
“稀有”角标美术资源替换
|
2021-05-18 20:36:43 +08:00 |
jiaoyangna
|
ea50404431
|
福星高照图片提交
(cherry picked from commit 11f9f993bd)
|
2021-05-18 20:22:58 +08:00 |
jiaoyangna
|
e70c9eb751
|
福星高照提交
|
2021-05-18 20:22:26 +08:00 |
jiaoyangna
|
11f9f993bd
|
福星高照图片提交
|
2021-05-18 20:21:58 +08:00 |
ZhangBiao
|
b88957bcad
|
【修行】神将增加神印显示
|
2021-05-18 20:04:52 +08:00 |
zhangqiang
|
f7ee7f5642
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 3
|
2021-05-18 18:18:45 +08:00 |
gaoxin
|
1c6789c0cf
|
【资源】新增英雄头像资源
|
2021-05-18 18:01:08 +08:00 |
gaoxin
|
c32e9a1007
|
【资源】新增立绘 资源
|
2021-05-18 17:47:47 +08:00 |
zhangqiang
|
2703f3e4f2
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 + 战斗背景音乐替换
|
2021-05-18 17:18:52 +08:00 |
zhangqiang
|
a40ec43b81
|
【山河社稷图】章节开启界面修改
|
2021-05-18 16:54:35 +08:00 |
zhangqiang
|
d36dfd9e25
|
【山河社稷图】是否通关
|
2021-05-18 16:51:43 +08:00 |
zhangqiang
|
c4865509b3
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 2
|
2021-05-18 16:41:48 +08:00 |
gaoxin
|
d084904f33
|
【公告】修改公告通道的配置位置
|
2021-05-18 16:19:36 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |
zhangqiang
|
3686c2a75f
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过
|
2021-05-18 15:58:44 +08:00 |
gaoxin
|
5c8ee62e42
|
【公告】添加空值判段
|
2021-05-18 15:53:44 +08:00 |
gaoxin
|
2b693b417e
|
【跳转】活动跳转添加开启判断
|
2021-05-18 15:50:17 +08:00 |
gaoxin
|
1da9223506
|
【公告】修改公告的字段名,version工具添加公告配置
|
2021-05-18 15:37:37 +08:00 |
zhangqiang
|
c27ddeb2a4
|
【山河社稷图】编队加职能 调副关卡恭喜获得背景层级
|
2021-05-18 15:17:05 +08:00 |
wangzhenxing
|
d19c7e1baf
|
图片提交
|
2021-05-18 15:02:15 +08:00 |
wangzhenxing
|
9ebc0f8401
|
公告修改提交
|
2021-05-18 15:01:59 +08:00 |
ZhangBiao
|
93b8746cfe
|
【修行】玩家信息界面神印提交
|
2021-05-18 14:59:47 +08:00 |
zhangqiang
|
433bcf9ddb
|
【添加音效】
|
2021-05-18 14:24:09 +08:00 |
jiaoyangna
|
85f0581895
|
元字,展示了两种艺术字
|
2021-05-18 14:13:54 +08:00 |
jiaoyangna
|
ae913260f8
|
18、30、68元档位切换按钮,可触碰区域加大
|
2021-05-18 11:44:51 +08:00 |
jiaoyangna
|
1bf7f53661
|
神将修改提交
|
2021-05-18 11:44:17 +08:00 |
gaoxin
|
8ed3371932
|
【限时召唤】修复左上角奖励领取报错
|
2021-05-18 11:42:47 +08:00 |
ZhangBiao
|
db0ede868d
|
【特权】保持开启
|
2021-05-18 09:35:25 +08:00 |
zhangqiang
|
be1b1698b5
|
【山河社稷图】提交
|
2021-05-17 20:08:33 +08:00 |
ZhangBiao
|
1086f182a0
|
【修行】提交
|
2021-05-17 19:49:48 +08:00 |
zhangqiang
|
32eace4be7
|
【山河社稷图】一键上阵修改
|
2021-05-17 19:34:23 +08:00 |
zhangqiang
|
fae85fc903
|
【魂印图鉴修改】
|
2021-05-17 18:24:47 +08:00 |
ZhangBiao
|
d0d20db65b
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 17:57:45 +08:00 |
ZhangBiao
|
1ee46493ab
|
【修行】上方玩家名字颜色修改
|
2021-05-17 17:56:23 +08:00 |
zhangqiang
|
d1e27ccdc3
|
【山河社稷图】编队bug
|
2021-05-17 17:54:21 +08:00 |
ZhangBiao
|
0fa0f251ba
|
【修行】巅峰赛名字颜色修改
|
2021-05-17 17:42:08 +08:00 |
ZhangBiao
|
8e1b42c0ac
|
【修行】名字颜色修改
|
2021-05-17 17:28:37 +08:00 |
ZhangBiao
|
8d2a0a86aa
|
【修行】战斗卡住提交
|
2021-05-17 16:04:39 +08:00 |
gaoxin
|
e76fb1dede
|
【社稷大典】修复未加入公会时,取消无限循环的问题
|
2021-05-17 15:49:59 +08:00 |
ZhangBiao
|
d53415d80b
|
【修行】名字颜色
|
2021-05-17 15:48:41 +08:00 |
zhangqiang
|
f6fb0c2071
|
【山河社稷图】宝箱奖励预览
|
2021-05-17 15:39:08 +08:00 |
ZhangBiao
|
ffd695f3b1
|
【修行】名字提交
|
2021-05-17 15:20:20 +08:00 |
ZhangBiao
|
58e7cea17e
|
【修行】名字颜色提交
|
2021-05-17 14:34:37 +08:00 |
gaoxin
|
b9d362b333
|
【屏幕适配】活动适配优化
|
2021-05-17 14:32:42 +08:00 |
ZhangBiao
|
10481bc650
|
【修行】名字颜色修改
|
2021-05-17 14:15:55 +08:00 |
ZhangBiao
|
6385b78048
|
【meta提交】
|
2021-05-17 11:59:01 +08:00 |
ZhangBiao
|
2b81c437e8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-17 11:58:06 +08:00 |
ZhangBiao
|
beb2d5b56c
|
【修行】提交
|
2021-05-17 11:57:54 +08:00 |
zhangqiang
|
5b4be5ef37
|
【山河社稷图】战斗回放提示
|
2021-05-17 11:55:34 +08:00 |
zhangqiang
|
810139a324
|
【协议合并提交】刷资源提交
|
2021-05-17 11:28:54 +08:00 |
zhangqiang
|
8e428148c4
|
【山河社稷图】提交
|
2021-05-17 11:15:43 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
ZhangBiao
|
c5df85efae
|
【修行】提交
|
2021-05-17 10:54:36 +08:00 |
ZhangBiao
|
f3cb51c858
|
【预设冲突】冲突修改后提交
|
2021-05-17 10:35:58 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
ZhangBiao
|
307c2c1e37
|
【冲突处理】复制general(big)popup
|
2021-05-17 10:31:45 +08:00 |
ZhangBiao
|
29b8fd144e
|
Revert "【修行】提交,预设冲突处理"
This reverts commit 79910218c5.
|
2021-05-17 10:29:34 +08:00 |
wangzhenxing
|
51392f0a62
|
服务器战斗逻辑同表工具修改
|
2021-05-17 10:21:23 +08:00 |
ZhangBiao
|
79910218c5
|
【修行】提交,预设冲突处理
|
2021-05-17 10:21:08 +08:00 |
ZhangBiao
|
5fe75af0bf
|
Merge branch 'china/dev' into 0功能/修行玩法
|
2021-05-17 10:15:42 +08:00 |
ZhangBiao
|
b13dabcad2
|
【修行】提交
|
2021-05-17 09:50:32 +08:00 |
jiaoyangna
|
00497c7071
|
无尽副本优化提交
|
2021-05-15 18:25:45 +08:00 |
gaoxin
|
533fd17972
|
【公会】满级显示添加
|
2021-05-15 18:03:25 +08:00 |
gaoxin
|
02649f00ca
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-15 17:40:21 +08:00 |
gaoxin
|
eac86d749f
|
【gm】引导测试功能优化
|
2021-05-15 17:38:58 +08:00 |
gaoxin
|
c3c485b209
|
【资源】云游商人资源修改
|
2021-05-15 17:36:47 +08:00 |
gaoxin
|
8e1da10b52
|
【剧情】注释打开
|
2021-05-15 17:06:04 +08:00 |
jiaoyangna
|
3c0131d7b1
|
每日豪礼修改提交
|
2021-05-15 16:46:08 +08:00 |
jiaoyangna
|
9662b5f236
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
# Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
|
2021-05-15 16:37:00 +08:00 |
jiaoyangna
|
5ad6b8d92d
|
【活动优化】福星高照奖励调整
|
2021-05-15 16:25:58 +08:00 |
zhangqiang
|
78e1a2b5a4
|
【山河社稷图】提交
|
2021-05-15 16:16:46 +08:00 |
jiaoyangna
|
269d1c4ae7
|
每日豪礼修改提交
|
2021-05-15 16:14:39 +08:00 |
gaoxin
|
96e08c7025
|
【红包】提示文字修改
|
2021-05-15 16:07:45 +08:00 |
gaoxin
|
502eb112c0
|
【红包】删除红包购买提示
|
2021-05-15 15:50:52 +08:00 |
jiaoyangna
|
58b2beb015
|
文字曲线提交
|
2021-05-15 15:39:53 +08:00 |
zhangqiang
|
9ccd6f9002
|
【车迟斗法】倒计时问题
|
2021-05-15 14:40:43 +08:00 |
jiaoyangna
|
585677c65b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-15 14:34:03 +08:00 |
jiaoyangna
|
b54c907427
|
商店名称提交
|
2021-05-15 14:33:49 +08:00 |
zhangqiang
|
54fa0110e5
|
【山河社稷图】提交
|
2021-05-15 13:49:18 +08:00 |
zhangqiang
|
11f17fca87
|
【山河社稷图】提交
|
2021-05-14 19:55:28 +08:00 |
jiaoyangna
|
848af2cbbe
|
下阵操作
|
2021-05-14 19:48:53 +08:00 |
jiaoyangna
|
d62b8b5011
|
无尽副本修改提交
|
2021-05-14 19:11:40 +08:00 |
jiaoyangna
|
6a13a56902
|
两个礼包预设修改
(cherry picked from commit 2bd439879b)
|
2021-05-14 19:10:05 +08:00 |
jiaoyangna
|
2bd439879b
|
两个礼包预设修改
|
2021-05-14 19:09:35 +08:00 |
jiaoyangna
|
896a52a6a1
|
乾坤宝盒弹窗提交
|
2021-05-14 19:06:12 +08:00 |
wangzhenxing
|
bcc175ea8f
|
【战斗】==========被动107 被动321 修改
|
2021-05-14 17:48:57 +08:00 |
ZhangBiao
|
87f18cb049
|
【修行】提交
|
2021-05-14 17:48:47 +08:00 |
zhangqiang
|
5292b1441b
|
【山河社稷图】提交
|
2021-05-14 16:44:40 +08:00 |
jiaoyangna
|
c62a293740
|
结束修改
|
2021-05-14 16:02:14 +08:00 |
gaoxin
|
6b9cfdd6c2
|
【资源】新增物品资源
|
2021-05-14 15:54:28 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
ZhangBiao
|
b3e40bac95
|
【修行】提交
|
2021-05-14 14:54:57 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
ZhangBiao
|
3229d0693b
|
【修行】提交
|
2021-05-14 13:21:38 +08:00 |
jiaoyangna
|
fac4b21c6b
|
活动结束报错修改
|
2021-05-14 13:21:01 +08:00 |