wangzhenxing
b368ef5fe0
礼物修改提交
2023-09-15 14:42:17 +08:00
wangzhenxing
e3a8cd725f
合并冲突提交
2023-09-15 14:24:03 +08:00
wangzhenxing
14ce1fedbd
时空神将推荐阵容显示修改提交
...
(cherry picked from commit 883f9af02e )
2023-09-15 14:18:47 +08:00
wangzhenxing
51dc91cbda
[战斗]=======================效果162 提交
...
(cherry picked from commit 56736a3aca )
2023-09-15 14:18:14 +08:00
wangzhenxing
acdb5a21cd
礼物修改提交
2023-09-15 14:11:14 +08:00
wangzhenxing
049cebd574
灵兽星际显示修改提交
2023-09-15 13:56:38 +08:00
wangzhenxing
883f9af02e
时空神将推荐阵容显示修改提交
2023-09-14 16:21:33 +08:00
wangzhenxing
56736a3aca
[战斗]=======================效果162 提交
2023-09-14 16:20:43 +08:00
PC-202302260912\Administrator
dca95dff13
修改页面布局
2023-09-13 16:38:07 +08:00
wangzhenxing
e80056fcd4
查看礼物信息提交
2023-09-13 15:44:06 +08:00
wangzhenxing
eeb3859f72
礼物功能提交
2023-09-13 14:57:48 +08:00
PC-202302260912\Administrator
739e495a60
罗杰相关
2023-09-12 16:19:20 +08:00
PC-202302260912\Administrator
d6aa6d2c90
添加模型
2023-09-12 14:35:12 +08:00
PC-202302260912\Administrator
72f8c9a5c7
漏一个
2023-09-12 14:22:03 +08:00
PC-202302260912\Administrator
68de6e2686
上传模型相关
2023-09-12 14:20:46 +08:00
PC-202302260912\Administrator
7ac17afab4
上传
2023-09-12 14:18:19 +08:00
PC-202302260912\Administrator
1811bde7d9
乌尔基
2023-09-12 14:16:26 +08:00
PC-202302260912\Administrator
ce772773cc
上传模型
2023-09-12 14:12:31 +08:00
xiejun
ccb0cd4838
修改混乱之后角色不行动的BUG
2023-09-11 17:59:32 +08:00
PC-202302260912\Administrator
b7c638b8b7
图标修改
2023-09-08 17:26:39 +08:00
wangzhenxing
b2e7822bf1
【战斗】===============效果10修改提交
2023-09-08 14:09:13 +08:00
wangzhenxing
4b34e64de7
工会开启 工会技能
2023-09-06 15:11:01 +08:00
wangzhenxing
6085b2193a
多对塔挑战修改
2023-09-06 14:43:33 +08:00
wangzhenxing
fdae5c1348
嘲讽图标修改
2023-09-06 10:31:10 +08:00
wangzhenxing
5314b7ccf6
添加嘲讽图标
2023-09-05 20:59:52 +08:00
wangzhenxing
db98c5dd91
Merge branch 'dev_oneDis' of http://192.168.1.21:3000/root/miduo_client into dev_oneDis
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2023-09-05 15:04:26 +08:00
PC-202302260912\Administrator
99bf06bd3b
魂印狂欢图标
2023-09-07 14:51:19 +08:00
wangzhenxing
2a5188a8fc
协议提交
2023-09-05 14:55:38 +08:00
PC-202302260912\Administrator
253858dfba
黄猿图片
2023-09-04 21:39:41 +08:00
PC-202302260912\Administrator
d2f39af497
阿龙上传
2023-09-04 20:10:53 +08:00
wangzhenxing
db3b8d9562
【战斗】====================被动添加479
2023-09-04 18:45:16 +08:00
xiejun
363b5a3818
图鉴UI
2023-09-04 18:27:40 +08:00
wangzhenxing
c889e67a43
英雄属性详情界面去除工会技能跳转
2023-09-04 16:57:01 +08:00
xiejun
731ca32f5b
修改BUG
2023-09-04 15:40:11 +08:00
xiejun
3993a248c0
修改bUG
2023-09-04 15:21:09 +08:00
PC-202302260912\Administrator
fcf92fcc50
添加动作
2023-09-04 14:51:27 +08:00
PC-202302260912\Administrator
d73b462e1d
上传美术资源
2023-09-04 14:00:24 +08:00
PC-202302260912\Administrator
4bfa80709f
修正头像
2023-09-02 19:17:32 +08:00
xiejun
87bd10593d
工会
2023-09-02 18:59:49 +08:00
xiejun
3ab79a59b7
副本UI
2023-09-02 18:53:21 +08:00
xiejun
c6d6e21e57
修改
2023-09-02 18:04:06 +08:00
xiejun
0a3533dbfe
挑战副本
2023-09-02 17:17:15 +08:00
xiejun
5b8ef487f7
御灵
2023-09-02 17:16:34 +08:00
PC-202302260912\Administrator
f4e90a59c4
新增图片
2023-09-02 16:12:34 +08:00
wangzhenxing
241fda7f84
命石修改提交
2023-09-02 12:28:14 +08:00
wangzhenxing
c39a4e1fcc
命石修改提交
2023-09-01 23:41:45 +08:00
xiejun
1a34fec66e
修复bug
2023-09-01 20:18:46 +08:00
wangzhenxing
f792ab4c7d
命石修改
2023-09-01 19:35:49 +08:00
wangzhenxing
1318c74f59
红点修改提交
2023-09-01 19:26:54 +08:00
PC-202302260912\Administrator
83eea07584
牛气冲天图片修正
2023-09-04 19:03:24 +08:00
wangzhenxing
c9418f9821
命石奖励预设修改
2023-09-01 19:01:33 +08:00
wangzhenxing
3ac8d1ee2c
魂印图鉴修改提交
2023-09-01 18:48:59 +08:00
wangzhenxing
ffaab0f625
命石飘战力提交
2023-09-01 18:29:25 +08:00
xiejun
83a8e9ab56
修改
2023-09-01 18:27:39 +08:00
wangzhenxing
55f0c6d3e6
魂印图鉴修改 ,命石修改
2023-09-01 18:04:52 +08:00
wangzhenxing
2b93776f7c
命格修改提交
2023-09-01 17:36:15 +08:00
wangzhenxing
0e083205a3
命格修改提交
2023-09-01 12:34:34 +08:00
PC-202302260912\Administrator
24933b853c
修改头像
2023-08-31 21:51:08 +08:00
wangzhenxing
18e10b4fb6
命格修改提交
2023-08-31 19:12:02 +08:00
wangzhenxing
5e1cc83b2a
命石修改提交
2023-08-31 15:20:27 +08:00
wangzhenxing
52393c592c
命石提交
2023-08-31 15:02:13 +08:00
wangzhenxing
e0cd811e75
百抽活动去掉时间显示
2023-08-31 10:31:27 +08:00
xiejun
837e769c14
七界
2023-08-30 22:07:43 +08:00
xiejun
e50aa15b47
修改代码
2023-08-30 21:33:02 +08:00
xiejun
f42141a40e
修改灵兽代码
2023-08-30 21:31:29 +08:00
xiejun
87c1193f8b
修改BUG
2023-08-30 21:25:36 +08:00
xiejun
f1b9b526c1
代码修改
2023-08-30 20:33:29 +08:00
PC-202302260912\Administrator
bb967fb2b6
香克斯图片替换
2023-08-30 11:06:03 +08:00
PC-202302260912\Administrator
e2ca24353a
布鲁克图片
2023-08-30 10:47:43 +08:00
xiejun
96efe07502
prefab布鲁克
2023-08-29 19:18:35 +08:00
wangzhenxing
f9774fd187
百抽活动修改提交,最多只显示七天奖励
2023-08-29 18:58:09 +08:00
xiejun
6ced2b0507
Merge branch 'dev_oneDis' into onepiece_demo
...
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
wangzhenxing
f838e2d0f2
轩辕宝镜修改
2023-08-29 15:21:53 +08:00
PC-202302260912\Administrator
a68e4b9326
上传图片
2023-08-29 14:52:10 +08:00
xiejun
4d8b08104c
七界资源
2023-08-28 18:52:15 +08:00
wangzhenxing
4ade868f90
抽卡去掉妖精限制提示
2023-08-28 14:04:41 +08:00
xiejun
f549956ebb
新预制体已经公会和活动ui
2023-08-28 11:34:43 +08:00
wangzhenxing
595487091b
【战斗】=======battlelogic修改
2023-08-25 18:58:32 +08:00
wangzhenxing
47edf3b630
【战斗】==================被动477 478修改
2023-08-25 18:32:56 +08:00
wangzhenxing
0d6566c725
【战斗】============被动472修改
2023-08-25 17:14:55 +08:00
wangzhenxing
d9778dbae4
【战斗】=================被动修改提交
2023-08-25 16:03:57 +08:00
wangzhenxing
91c292a809
[战斗]================被动475修改
2023-08-25 11:49:56 +08:00
wangzhenxing
4cbe612e03
新英雄 buff图标提示提交
2023-08-24 18:21:09 +08:00
wangzhenxing
d28ca0a5fb
【战斗】===============新英雄被动修改
2023-08-24 18:20:04 +08:00
wangzhenxing
461029ab50
[战斗]=================战斗battleutil 修改
2023-08-24 14:48:59 +08:00
wangzhenxing
4205ce3afc
[战斗]==============被动474修改
2023-08-24 10:27:30 +08:00
wangzhenxing
178ba22181
[战斗]======================时空女儿国王 新英雄提交
2023-08-23 16:33:16 +08:00
wangzhenxing
3037378c42
神将热榜, 图鉴预设修改提交
2023-08-23 16:04:46 +08:00
wangzhenxing
07ffec7f1f
【合服】=============登录协议添加serverid
2023-08-22 13:59:39 +08:00
xiejun
9d3234a34b
修改BUG
2023-08-18 21:40:29 +08:00
xiejun
65d783dae1
修改BUG
2023-08-18 17:55:02 +08:00
wangzhenxing
4e388c1923
礼包提示修改
2023-08-17 13:44:14 +08:00
xiejun
21d0262140
修改预制体
2023-08-16 16:42:05 +08:00
xiejun
9b10e84e8c
去掉log
2023-08-16 15:49:41 +08:00
xiejun
46f5d0e897
路飞黑边
2023-08-16 15:08:37 +08:00
xiejun
15e6d575d0
修改战斗编辑器
2023-08-16 14:40:51 +08:00
xiejun
734cb92be9
去掉pating和spriteloader相关的代码
2023-08-16 11:55:55 +08:00
wangzhenxing
a2ed294523
英雄信息界面变身卡星级显示修改
2023-08-16 11:36:58 +08:00
PC-202302260912\Administrator
d54713749e
修改图片资源
2023-08-16 11:18:28 +08:00
xiejun
edebfb4d63
修改bug
2023-08-16 10:49:55 +08:00
xiejun
636a7bc3eb
配置
2023-08-15 21:16:42 +08:00
xiejun
32d5e9bb97
修改BUG
2023-08-15 20:52:29 +08:00
PC-202302260912\Administrator
1209c49b97
修改图片
2023-08-15 20:46:43 +08:00
xiejun
5d7fcc5aec
修改bug
2023-08-15 20:25:06 +08:00
PC-202302260912\Administrator
00c5414b07
上传例会图片
2023-08-15 20:09:09 +08:00
PC-202302260912\Administrator
210bac8bfe
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
2023-08-15 19:15:10 +08:00
PC-202302260912\Administrator
09d582af1e
立绘
2023-08-15 19:11:44 +08:00
xiejun
7a898b34a6
no message
2023-08-15 19:04:16 +08:00
xiejun
06733b98e2
配置
2023-08-15 17:36:26 +08:00
xiejun
58f205f22b
新图标
2023-08-15 17:03:19 +08:00
xiejun
01087658fc
公会UI
2023-08-15 16:26:36 +08:00
xiejun
73fea65fe8
立绘
2023-08-15 16:20:05 +08:00
xiejun
15b598237e
修改bug
2023-08-15 15:50:24 +08:00
xiejun
935b3ba42b
黑胡子
2023-08-15 15:30:06 +08:00
xiejun
b089acd68c
修改
2023-08-15 15:08:56 +08:00
xiejun
f20b9e3c02
修改表格
2023-08-15 14:37:14 +08:00
xiejun
acefb9da0c
修改立绘
2023-08-15 14:11:32 +08:00
xiejun
49df3050d1
代码
2023-08-15 13:31:06 +08:00
xiejun
bbde945918
新角色立绘
2023-08-15 12:36:04 +08:00
xiejun
19231ba20a
公会UI
2023-08-14 16:36:26 +08:00
wangzhenxing
9cb8cd4b06
玩家战斗力计算提交注释
2023-08-14 16:15:07 +08:00
wangzhenxing
3e08e50ea5
周卡预设修改提交
2023-08-11 19:25:16 +08:00
xiejun
148443883c
神将
2023-08-11 19:03:48 +08:00
wangzhenxing
67e00f2348
神兵上阵列表显示修改提交
2023-08-10 13:50:58 +08:00
wangzhenxing
bd11611e2d
易经宝库层级显示修改提交 最终大奖名字显示修改
2023-08-10 13:47:37 +08:00
wangzhenxing
14db632938
屏蔽宝物 树添加的属性==================战斗力不一致问题
2023-08-09 17:57:35 +08:00
wangzhenxing
8800ec962b
封神之路双队塔开启条件修改
2023-08-09 13:54:59 +08:00
wangzhenxing
34834da938
心愿法宝开启文字提示修改
2023-08-08 17:21:11 +08:00
wangzhenxing
201d64e5b3
置换玉去除加号
2023-08-08 15:45:59 +08:00
wangzhenxing
971ef8c453
变身卡战斗力计算修改
2023-08-08 15:45:14 +08:00
wangzhenxing
23e7d219e7
刷冲特权满足条件修改
2023-08-07 21:20:37 +08:00
wangzhenxing
56cdd1b8d3
gm刷冲描述修改 ,特权特权激活修改
2023-08-07 20:10:34 +08:00
wangzhenxing
f591f0c76e
快速挑战入口开启条件修改
2023-08-07 18:59:29 +08:00
wangzhenxing
59c75221b0
七界秘宝开启奖励显示修改
2023-08-07 15:47:14 +08:00
wangzhenxing
a4e6d63433
修行对应颜色名字修改
2023-08-07 14:28:11 +08:00
xiejun
43d80275b9
神将部分UI替换
2023-08-04 18:58:14 +08:00
wangzhenxing
5b88556d9a
心愿抽卡提示修改
2023-08-04 16:41:33 +08:00
wangzhenxing
9b7edc9908
聊天限制修改
2023-08-04 16:28:28 +08:00
wangzhenxing
6d82c9d02d
工会屏蔽修改工会宣言入口
2023-08-04 16:24:24 +08:00
wangzhenxing
49d7c26a39
心魔试炼快速挑战开启条件修改
2023-08-04 15:15:08 +08:00
wangzhenxing
7f0038e9c4
宝物===========红点修改提交
2023-08-03 16:16:33 +08:00
wangzhenxing
163c0eff09
神印套装技能显示修改
2023-08-03 15:23:20 +08:00
wangzhenxing
0a3f661417
主角变身卡升星升到最高星级,提升另外一个显示异常修改
2023-08-03 11:45:46 +08:00
PC-202302260912\Administrator
d0c184cc42
狂欢图标修改
2023-08-02 17:09:16 +08:00
wangzhenxing
92d9d4a413
山河设计图提示修改
2023-08-02 15:44:43 +08:00
wangzhenxing
c32b71d3fc
变身卡无法升星修改,法宝超过10级显示修改
2023-08-02 14:46:18 +08:00
wangzhenxing
073d87eda7
妖精累充banner图替换修改
2023-08-01 16:31:26 +08:00
wangzhenxing
1fe1525b62
明望特权上面显示经验升级所需经验修改
2023-07-31 18:53:23 +08:00
wangzhenxing
9b7627ffe0
商店界面预设修改提交
2023-07-31 18:12:46 +08:00
wangzhenxing
cda1bc9893
灵脉秘境置灰能进入问题修改
2023-07-31 17:56:30 +08:00
wangzhenxing
c9bb9fabcc
聊天开启条件修改,提示修改
2023-07-31 17:43:39 +08:00
wangzhenxing
a025c1b250
特殊渠道特殊礼包显示处理
2023-07-31 16:03:24 +08:00
wangzhenxing
143e47c6ee
特殊渠道特殊展示修改提交
2023-07-31 15:22:25 +08:00
wangzhenxing
b3d94c4dc9
聊天发言限制修改
2023-07-31 14:50:23 +08:00
wangzhenxing
5edb051da9
心愿抽卡改回之前提示
2023-07-31 14:32:22 +08:00
wangzhenxing
fbf0411174
刷冲特权价格修改
2023-07-31 14:07:26 +08:00
wangzhenxing
11fd9a1061
小7礼包特殊处理
2023-07-28 15:22:23 +08:00
wangzhenxing
6dbb9aca5d
儿童协议,分享特殊显示提交
2023-07-28 14:21:40 +08:00
xiejun
fd8329bf90
海贼UI
2023-07-27 18:37:04 +08:00
wangzhenxing
7523d9d667
明望特权等级添加默认值
2023-07-26 15:15:52 +08:00
wangzhenxing
aa86f127f4
神将法宝心愿抽卡提示修改
2023-07-26 14:26:34 +08:00
wangzhenxing
dff7664cab
聊天==============添加聊天限制
2023-07-26 10:31:27 +08:00
wangzhenxing
5ac2ed1220
山河设计图添加关卡提示
2023-07-24 11:31:36 +08:00
wangzhenxing
d4585f2c97
【战斗】=====================被动添加470
2023-07-21 17:46:35 +08:00
xiejun
8a4e15e258
海贼UI替换
2023-07-21 17:04:16 +08:00
wangzhenxing
1e7aba83c2
礼包,屏蔽附赠仙晶的提示
2023-07-21 14:59:53 +08:00
wangzhenxing
f298816345
寻宝激活按钮改为跳到刷冲特权界面
2023-07-20 18:48:34 +08:00
wangzhenxing
a2d3393829
变身卡升级升星去除 消耗妖精显示
2023-07-20 18:39:01 +08:00
wangzhenxing
06022bf0ae
变身卡升级升星屏蔽化身之力显示
...
(cherry picked from commit 5855e6e1cf )
2023-07-20 18:12:41 +08:00
wangzhenxing
e9e1eec1f8
屏蔽宗门红包入口显示
2023-07-20 18:05:17 +08:00
PC-202302260912\Administrator
a1294d8746
天宫寻宝文字修改
2023-07-20 15:42:56 +08:00
PC-202302260912\Administrator
1540c24358
推送礼包去除 showtype 33 数据
2023-07-19 19:03:15 +08:00
PC-202302260912\Administrator
1081ed5827
推送 折扣礼包==================注释删除的推送礼包
2023-07-19 18:06:01 +08:00
PC-202302260912\Administrator
b6718cefca
装备心愿抽卡显示剩余必中次数
2023-07-19 15:40:15 +08:00
PC-202302260912\Administrator
a40bfe0fd8
功能开启条件修改
2023-07-19 15:05:02 +08:00
PC-202302260912\Administrator
2cb20e9bba
英雄获取途径显示修改
2023-07-19 14:35:52 +08:00
PC-202302260912\Administrator
609bc6e6b1
抽卡注释小tip提示信息
2023-07-18 16:17:15 +08:00
PC-202302260912\Administrator
da7727ba02
item预设特效显示修改
2023-07-18 16:09:16 +08:00
PC-202302260912\Administrator
e7084afe68
法宝==================法宝特性激活显示等级修改
2023-07-18 16:08:15 +08:00
xiejun
ed0681d015
路飞,萨博
2023-07-17 18:47:07 +08:00
PC-202302260912\Administrator
4e949b17b0
日常副本入口文字图片修改提交
2023-07-17 17:50:16 +08:00
PC-202302260912\Administrator
2082425679
抽卡界面预设修改,添加未开启信息提示
2023-07-17 17:38:43 +08:00
PC-202302260912\Administrator
65b4f5fc20
周卡活动名称修改
2023-07-17 14:48:27 +08:00
PC-202302260912\Administrator
15cce82e7a
法宝抽卡添加开启限制
2023-07-17 14:27:56 +08:00
PC-202302260912\Administrator
04fc28856d
关卡奖励提示图片文字修改提交
2023-07-17 11:03:51 +08:00
PC-202302260912\Administrator
addd9312da
玲珑商店图片资源提交
2023-07-14 14:29:52 +08:00
PC-202302260912\Administrator
08e1057cf6
月卡基金50倍图片修改提交
2023-07-14 13:58:47 +08:00
PC-202302260912\Administrator
eafdbd9f44
Revert "屏蔽挂机界面寻宝入口显示及红点检测"
...
This reverts commit 374e6d80cd .
2023-07-14 11:27:34 +08:00
PC-202302260912\Administrator
2987bc24a2
心魔试炼=================屏蔽神应显示
2023-07-14 11:24:26 +08:00
PC-202302260912\Administrator
b5bcce6eab
抽卡道具显示修改
2023-07-13 17:52:56 +08:00
PC-202302260912\Administrator
48596fc57f
Merge branch 'china/dev_fengTi' of http://192.168.1.21:3000/root/miduo_client into china/dev_fengTi
2023-07-13 17:24:55 +08:00
xiejun
87dfec134c
修改代码
2023-07-13 17:04:48 +08:00
PC-202302260912\Administrator
49958d7b10
背包==================屏蔽魂印,变身,聚灵按钮
2023-07-13 17:01:05 +08:00
xiejun
937ec44bf5
立绘和代码修改
2023-07-13 14:38:34 +08:00
PC-202302260912\Administrator
1632820d89
代金券弹窗提示修改
2023-07-12 18:59:49 +08:00
PC-202302260912\Administrator
6a8cc22103
刷充特权原特权价格显示修改
2023-07-12 18:59:06 +08:00
PC-202302260912\Administrator
02a2374c53
主城=======洞府,跨服战入口屏蔽,灵兽山位置修改
2023-07-12 18:23:39 +08:00
PC-202302260912\Administrator
8419048c88
日常副本图片修改提交
2023-07-12 17:41:04 +08:00
PC-202302260912\Administrator
c5bc3d8e04
超值连冲==================屏蔽 12元 30元挡位礼包
2023-07-12 15:41:52 +08:00
PC-202302260912\Administrator
18691fb97e
法宝技能信息显示修改
2023-07-11 13:48:33 +08:00